Commit graph

205 commits

Author SHA1 Message Date
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
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
508d737b6a Updating HtmlHelper::css, JavascriptHelper::link to not replace multiple occurences of CSS_URL or JS_URL when using Asset.filter settings.
Test cases added.
Thanks to 'robustsolution' for the patch.
Fixes #105
2009-09-26 14:22:12 -04:00
mark_story
7f49f7f455 Updating HtmlHelper and JavascriptHelper to use Helper::assetTimestamp 2009-09-24 00:16:19 -04:00
mark_story
26d2237df0 Making conditions easier to read.
Adding additional test for image timestamping.
Refs #108
2009-09-23 23:30:55 -04:00
ADmad
de4737323f Updated Html and Javascript helpers to suffix asset urls with timestamp even when the app is run off a subfolder on the domain
Signed-off-by: Mark Story <mark@mark-story.com>
2009-09-23 23:30:34 -04:00
mark_story
022f8ccaa2 Making conditions easier to read.
Adding additional test for image timestamping.
Refs #108
2009-09-22 19:04:40 -04:00
ADmad
07a89cd953 Updated Html and Javascript helpers to suffix asset urls with timestamp even when the app is run off a subfolder on the domain
Signed-off-by: Mark Story <mark@mark-story.com>
2009-09-22 18:57:30 -04:00
mark_story
ce7864920f Adding ability to add arbitrary attributes to HtmlHelper::scriptBlock. Test case added. 2009-09-03 13:50:53 -04:00
mark_story
ead3b0ecf6 Allowing HtmlHelper::script() to take an array of options, allows for custom attributes to be added to script include tags. Test cases added. Fixes #2955 2009-09-03 13:45:39 -04:00
mark_story
c963d5cc43 Updating file headers. 2009-09-03 12:43:13 -04:00
mark_story
533f6e0d36 Updating doc block. 2009-08-26 22:54:23 -04:00
mark_story
136b4db7ad Deprecating $escape for HtmlHelper::tag() use $attributes['escape'] instead. Test case added. 2009-08-26 22:46:49 -04:00
mark_story
6d1c38c1cc expanding doc blocks. 2009-07-29 22:48:40 -04:00
mark_story
def4c98a08 Merge branch '1.3' into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/header.php
2009-07-25 17:35:27 -04:00
mark_story
2414a43c91 Adding HtmlHelper::scriptStart and HtmlHelper::scriptEnd. Further deprecates JavascriptHelper. Fixing issues in test case. 2009-07-25 15:43:26 -04:00
mark_story
4ebf5a4e32 Merge commit 'code/1.3' into 1.3-jshelper
Conflicts:
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/lib/header.php
2009-07-25 01:35:36 -04:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
mark_story
9c51f720ed Merge branch '1.3' into jshelper-integration
Conflicts:
	cake/tests/cases/libs/view/helpers/js.test.php
2009-07-06 23:43:57 -04:00
davidpersson
68d333d088 Applying patches by ADMad updating HtmlHelper and adding test. Adding missing properties in test case. Preventing bleed through in test case. Fixes #6490
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8220 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-04 22:04:40 +00:00
mark_story
1910e5482b Updating doc block for HtmlHelper::css(). Fixes #6059
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8175 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-22 01:25:13 +00:00
mark_story
4b690237f0 Merge branch '1.3' of git@thechaw.com:cakephp into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/html.php
2009-03-15 13:20:43 -04:00
mark_story
91e47a6379 Adding scriptBlock() to HtmlHelper.
Adding tests.
2009-03-12 22:59:55 -04:00
mark_story
7ea7bd90c2 Moving script() method into HtmlHelper.
Moving tests.
2009-03-12 19:51:30 -04:00
mark_story
8025743830 Fixing doc blocks in HtmlHelper 2009-03-12 19:34:04 -04:00
renan.saddam
b0a0f2ad30 Refactoring last change to cover issues like [7636]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8079 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 13:29:56 +00:00
mark_story
c164be8c03 Enabling Asset.timestamp for HtmlHelper::image() making it consistent with Javascript::link().
Tests added.
Fixes #6170

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8078 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 04:40:50 +00:00
the_undefined
74bf622866 Fixes #6071
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8053 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-23 15:19:33 +00:00
mark_story
01340e8014 Fixing docblocks in HtmlHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8048 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-18 19:07:15 +00:00
mark_story
e7c71b4125 Updating doc blocks in helpers. Helps generate cleaner API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8014 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-03 18:48:28 +00:00
TommyO
de1d1ae3bd Fixed asset.timestamp inconsistency for css files.
Added tests to confirm css linking.
Closes #5990. Fixes #5991

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7990 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:19:11 +00:00
nate
ad208ff8c3 Refactoring previous fix to revert markup changes in HtmlHelper, updating FormHelper tests to comply with coding standard, correcting bad assertions, fixing issue with field types being mis-identified if duplicate names are used, fixes #5919
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7959 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-25 22:13:06 +00:00
nate
61850b1be1 Cleaning up test code formatting, adding fix for POST hash validation of checkbox lists, fixes #5903, test cases added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7951 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-23 08:13:00 +00:00
mark_story
c49f213fcf Adding spaces before self close of meta link elements. W3C recommends a space before />. Fixes #5821
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7899 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-30 05:25:37 +00:00
mariano.iglesias
e9953e3f93 Fixing issue where JavascriptHelper::link was generating wrong URLs when webroot is defined and appending timestapping. Fixing issue in previous commit. Fixes #5723, fixes #5045
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7851 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 12:45:00 +00:00
mariano.iglesias
81e2f4a044 Fixing commit in r7843 so real files are accounted for
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7850 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 12:34:51 +00:00
mariano.iglesias
8777b8ef96 Fixing issue where double call to webroot on HtmlHelper::css was generating wrong URLs when forcing asset timestamp, fixes #5723
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7843 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 00:24:51 +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
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
mariano.iglesias
46620f8ee2 Fixing issue where reference fatal is thrown with PHP 5.0.5
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7552 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 13:35:04 +00:00
nate
0119c0d46f Fixing HTML entity escaping in helpers, fixing broken XmlHelper test, all helper tests now passing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7403 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 04:53:16 +00:00
mark_story
e20944a976 Added patch from 'biesbjerg' corrects timestamps not being applied to Vendors css and js. Closes #5045
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7325 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-07 01:19:41 +00:00
nate
f7a4858503 Correcting coding standards violations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7220 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 11:57:56 +00:00
nate
63217b7e10 Fixing failing tests in core helper group, closes #4946
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7213 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-19 14:31:00 +00:00
gwoo
2756634b73 removing deprecated methods from HtmlHelper, File, and Folder
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7182 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-13 18:53:06 +00:00
mark_story
44159ec303 Removed all references to Router::url in all helpers. Closes #4880. Fixed failing test in RssHelper, added more tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7164 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 02:10:32 +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
nate
7402680cc1 Misc code formatting and whitespace fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7020 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 05:11:41 +00:00
joelmoss
be63f26e78 Improving documentation for HtmlHelper::tableCells()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7004 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 12:32:38 +00:00