Commit Graph

724 Commits

Author SHA1 Message Date
Ingo Schommer
9a6483b024 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:25:44 +00:00
Hayden Smith
936d0cd319 Merged [47019]: Actual merge in [60309]
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60307 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 01:31:40 +00:00
Hayden Smith
475bffa479 Committing merge info for [60309]: Merge was performed manually.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60303 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 01:21:56 +00:00
Hayden Smith
f74a39d1b0 Merged [47018]: Some additions made to use Object::create to allow MemberTableField to deal with subclasses of Member. Also merged a modification to MemberTableField::__construct that allowed greater control over the details form's fields (defaults to same behaviour as trunk), and MemberTableField::DetailForm, although this might need to be removed later.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 01:14:07 +00:00
Ingo Schommer
cc0117a307 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:21:44 +00:00
Ingo Schommer
574fdb190d (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60287 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:14:48 +00:00
Ingo Schommer
c4651a2fda (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:03:57 +00:00
Ingo Schommer
2ea27c63f9 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:53:56 +00:00
Ingo Schommer
66b916abc5 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:29:30 +00:00
Ingo Schommer
7ec72c8254 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:17:51 +00:00
Ingo Schommer
0a4deb5c7f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:49:59 +00:00
Hayden Smith
9a24dd6c42 Merged [47017]: Modified behaviour for MemberTableField popups so that the behaviour is applied if the Security section uses a subclass of MemberTableField rather than an instance of MemberTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60257 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:45:42 +00:00
Hayden Smith
cd86e016a0 Merged [47016]: Used Object::create to allow SecurityAdmin to use subclasses of MemberTableField to list members.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 21:41:10 +00:00
Ingo Schommer
e29feeecac (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 07:03:24 +00:00
Ingo Schommer
23df65ec5a (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:53:26 +00:00
Ingo Schommer
772490ca99 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:40:50 +00:00
Ingo Schommer
3fe17e9649 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:29:50 +00:00
Ingo Schommer
649ff87aec (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:18:32 +00:00
Ingo Schommer
689c34400b (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:57:44 +00:00
Ingo Schommer
39f7ba95bf MINOR syntax error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60216 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:07:31 +00:00
Ingo Schommer
8a4c5fef72 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:00:42 +00:00
Ingo Schommer
6401ee7eaf (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:53:34 +00:00
Ingo Schommer
9fcc91bcbd (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:38:44 +00:00
Ingo Schommer
08beafbcdb (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:06:52 +00:00
Ingo Schommer
2b87d00c13 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:54:55 +00:00
Ingo Schommer
83fff5f1c1 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:16:46 +00:00
Ingo Schommer
05ad3c8e1c (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:00:40 +00:00
Hayden Smith
7e791ea681 Merged [47015]: Moved call to DataObject::write and makes use of DataObject::destroy.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60179 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 05:01:42 +00:00
Hayden Smith
fc1cea3817 Merged [47011]: Additional CSS for GenericDataAdmin.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:56:27 +00:00
Hayden Smith
4144a01e14 Merged [47010]: Modified GenericDataAdmin::buildResultFieldValue to accept relations of the form: obj1.obj2...objN->MethodCall, similar to TableListField_Item.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:50:54 +00:00
Hayden Smith
587394879e Merged [47009]: Calls bind using Prototype Event.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:37:10 +00:00
Hayden Smith
f2a2903c0e Merged [47008]: Disables the create button while creating a new entry with GenericDataAdmin.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:32:44 +00:00
Hayden Smith
438b6b5f85 Merged [47007]: Fix to prevent GenericDataAdmin setting a status on a new record and thus overwritting a data field named 'Status'. Includes a fix for onclick on Ajax buttons if event is not passed.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:29:32 +00:00
Ingo Schommer
4b5ab8a997 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 06:54:59 +00:00
Ingo Schommer
5000d0a227 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:43:48 +00:00
Ingo Schommer
e858222ce1 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:36:18 +00:00
Ingo Schommer
038bcbb8d9 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:28:25 +00:00
Ingo Schommer
12899b864c ENHANCEMENT Added CSS class "field" to templates of TableListField and subclasses
ENHANCEMENT Added <div class=""middleColumn"> around TableListField templates and all subclasses

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59286 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:44:33 +00:00
Ingo Schommer
e8b0754250 BUGFIX Changed span.middleColumn to .middleColumn in cms_right.css in preparation for building proper HTML/XHTML nesting in formfields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59285 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:42:27 +00:00
Ingo Schommer
d4f444b644 BUGFIX Changed span.middleColumn to .middleColumn in cms_right.css in preparation for building proper HTML/XHTML nesting in formfields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:41:50 +00:00
Ingo Schommer
0f642e8bbd BUGFIX Fixed colspan on <td class="actions"> in MemberTableField.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:38:38 +00:00
Sam Minnee
84668f8097 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58984 467b73ca-7a2a-4603-9d3b-597d59a354a9 2008-07-23 04:39:14 +00:00
Sam Minnee
3b602a3390 Added missing semicolons to javascript snippets returned after publish
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58346 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-18 03:40:32 +00:00
Ingo Schommer
bb3c40cdd2 FEATURE (by simon_w) Add LeftAndMain::require_css()/require_javascript/require_themed_css() for easier customization in CMS (patch from #2636)
ENHANCEMENT Applied LeftAndMain::require_javascript() to blog bbcodehelp.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58300 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-17 21:08:35 +00:00
Sam Minnee
6561b9be04 BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-10 23:29:20 +00:00
Sam Minnee
67d4cb7a70 Fixed ImageField file store selector in IE7
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57763 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-10 23:16:17 +00:00
Ingo Schommer
2c2412267b Merged revisions 57390 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron

........
  r57390 | ischommer | 2008-07-04 11:06:25 +1200 (Fri, 04 Jul 2008) | 1 line
  
  BUGFIX Preventing non-ajax form submit in CMSMain when pressing enter-key inside certain form fields in Firefox - overloaded onsubmit to use CMSForm->save() now
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-03 23:17:55 +00:00
Ingo Schommer
388e73fef3 Initialized merge tracking via "svnmerge" with revisions "54968" from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-03 23:14:20 +00:00
Ingo Schommer
00ad968072 Initialized merge tracking via "svnmerge" with revisions "54968" from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-03 23:12:57 +00:00
Ingo Schommer
6cf87c6a7a Initialized merge tracking via "svnmerge" with revisions "54968" from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57384 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-03 23:10:11 +00:00