Commit Graph

51 Commits

Author SHA1 Message Date
Ingo Schommer
3aef9fef1e Merge remote-tracking branch 'origin/2.4' into post-2.4
Conflicts:
	composer.json
	javascript/CMSMain_left.js
	javascript/LeftAndMain.js
2013-01-06 22:37:56 +01:00
Ingo Schommer
41aec54e88 BUG Consistently use FormResponse in CMS JavaScript (fixes #8036)
Regression caused by a security fix in 9bf3ae9a190
2012-12-04 12:07:17 +01:00
Ingo Schommer
5d9c49a321 ENHANCEMENT Showing full error message in LeftAndMain JavaScript if Ajax response comes through as text/plain 2012-01-13 00:30:19 +01:00
Ingo Schommer
29b9452df9 MINOR Avoid stale version state in VersionList javascript (AIR-22) 2011-08-30 14:07:45 +02:00
Ingo Schommer
4ecd5d9adf BUGFIX Disable CMS buttons while ajax request is executing to avoid double submissions 2011-08-22 16:11:28 +02:00
Ingo Schommer
c19aa2ce85 MINOR Making some JavaScript strings in cms/javascript translatable, and updated their cs_CZ and sk_SK translations (fixes #6085, thanks Pike)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer
4bc9a5aee8 MINOR Removed unused SecurityAdmin->MemberForm() and savemember() (see MemberTableField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Luke Hudson
229760a1e1 MINOR: Add some documentation to LeftAndMain_right.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108559 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:46 +13:00
Ingo Schommer
155a04578d BUGFIX Checking for existence of $('SwitchView') (fixes #5282)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108436 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:45 +13:00
Tom Rix
07ab02b29d BUGFIX allow HTMLEditorFields to save in SiteConfig, fixes #5246
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102160 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:25 +13:00
Ingo Schommer
8d359d1703 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:49 +13:00
Sam Minnee
096bfb2565 BUGFIX: Fix image tracking not working cross subsite (from r88008)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Luke Hudson
305cfe9c36 REVERT: Code duplicated, as Observable interface can be used instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96448 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Luke Hudson
904fcf02d0 FEATURE: Add onLoad callback handler CMSLoadFunctions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Sean Harvey
42a6692d79 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 01:44:28 +00:00
Ingo Schommer
8e442176e7 BUGFIX Fixed Form_EditForm_Locale reference in LeftAndMain_right.js (used to be Form_EditForm_Lang)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@74071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-03 21:24:59 +00:00
Ingo Schommer
893df91e33 ENHANCEMENT Adjusted CMSMain and LeftAndMain to use locales instead of short lang codes when reading and writing translations. See r73468 for details on the underlying Translatable datamodel change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-20 08:49:27 +00:00
Ingo Schommer
a78ce1998e MINOR Removed console.debug() from LeftAndMain_right.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 10:51:34 +00:00
Sean Harvey
9d32dd4026 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:26:44 +00:00
Sean Harvey
3680bbea46 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:22:20 +00:00
Sean Harvey
3d4630a2c8 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71259 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 02:50:25 +00:00
Ingo Schommer
b319355c67 ENHANCEMENT Augmenting stage links in CMS with &lang URL parameter if Translatable is enabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 12:39:51 +00:00
Ingo Schommer
300435fb13 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:36:30 +00:00
Ingo Schommer
7b3068ac4f MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69703 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 06:17:59 +00:00
Ingo Schommer
3c8e45f65a MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@67466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:58 +00:00
Sam Minnee
2ee0c0991b Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:50 +00:00
Normann Lou
76afea41bc APICHANGE: tidy up NewsletterAdmin.
BUGFIX: a lot of methods in this class now passed $params as HTTPRequest object, rather than as a array if the function is called from Ajax or top-level of front-end, some method is called in both manner, ie. called from Ajax and called internally as well, so we need to check $params type and do further process. This is a partial fix of open source ticket #3035

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 22:23:48 +00:00
Ingo Schommer
d8acf97911 MINOR JS translations in LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65292 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 14:38:59 +00:00
Ingo Schommer
415390373e BUGFIX Fixed js error in LeftAndMain_right.js when displaying readonly pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65148 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 13:53:23 +00:00
Sam Minnee
884795b6e8 BUGFIX: Content wasn't saving on subsequent page loads, after TinyMCE3 upgrade
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-28 04:32:30 +00:00
Sam Minnee
9f4ad4b2cc FEATURE: Update to TinyMCE 3.2 - CMS changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64758 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:03:33 +00:00
Hayden Smith
365622c0c9 Implemented a jQuery based version of documents.getElementsBySelector
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64339 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 02:09:46 +00:00
Hayden Smith
690cebdccd Merged from branches/nzct-trunk. Use 'svn log -c <changeset> -g' for full commit message. Merge includes stability fixes and minor refactor of TableListField and ComplexTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 02:00:39 +00:00
Ingo Schommer
ee4c409e56 ENHANCEMENT Started using ss.i18n clientside javascript in LeftAndMain classes (only a fraction made translatable)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 00:48:34 +00:00
Sam Minnee
743dce78b7 ENHANCEMENT #1848 - Select the title field for new pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-02 10:11:08 +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
Sam Minnee
e0ff08a4b0 Merged revisions 51963 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r51963 | sminnee | 2008-04-01 17:08:14 +1300 (Tue, 01 Apr 2008) | 1 line
  
  Fix to anchor insertion
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53494 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:36:52 +00:00
Sean Harvey
2277725b8f Ticket #1496 - IE fix and css changes to buttons on tree actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44125 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-01 22:39:25 +00:00
Sean Harvey
fa94bb8ec2 Removed status box, tweak treepanes css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44123 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-01 22:31:27 +00:00
Ingo Schommer
9277c49640 ENHANCEMENT: changed <p class="Actions"> to <div class="Actions">
ENHANCEMENT: Better linebreaks, markup formatting

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43560 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-18 01:07:35 +00:00
Ingo Schommer
b7be0c523a reverted "comment-out-bugfix" from r41968
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41967 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:59:34 +00:00
Ingo Schommer
670c9ca573 mrisen: Resolved "undefined" error message popup in Safari with AJAX iframe load
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41966 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:57:58 +00:00
Ingo Schommer
271a5cc7fc elofgren: Give location of error in the alert() that is inside a catch block in LeftAndMain?_right.js CMSForm.loadNewPage() to make debugging Safari 3 problem easier. See: http://www.silverstripe.com/google-summer-of-code-forum/flat/1982
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:22:10 +00:00
Ingo Schommer
ad25e8b900 elofgren:USABILITY: Add ajax network-save.gif icon to all 'Save' buttons while they are being submitted. Also add it to 'Save & Publish' and 'Unpublish' buttons. Fulfills: http://www.silverstripe.com/google-summer-of-code-forum/flat/1654?showPost=1730#post1730
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:11:50 +00:00
Ingo Schommer
3d5deccd43 elofgren: USABILITY: Make it so that the "Save" button text changes to "Saving..." and the "Save & Publish" button changes to "Publish..." while the request is being sent to server. Requested here:
http://www.silverstripe.com/google-summer-of-code-forum/flat/1654?showPost=1730#post1730    
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:04:51 +00:00
Ingo Schommer
15d40c5cf1 elofgren: USABILITY: Rename 'Save draft' button to 'Save' and make 'Publish' (will be renamed 'Save & Publish') button save the new draft in addition to publishing it.
Requested here: http://www.silverstripe.com/google-summer-of-code-forum/flat/1654?showPost=1730#post1730 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:00:03 +00:00
Ingo Schommer
f7ed6b050f elofgren: USABILITY: 1. Always use confirmation when calling autoSave, not just for 'Microsoft Internet Explorer' since the new confirm() dialog works in all browsers.
2. Make MainMenu? links call LeftAndMain?_window_unload() to check for unsaved changes before loading new page. Don't register LeftAndMain?_window_unload with window 'beforeunload' event because it 
cannot stop the page unload and the save check is now done via links (where stopping the unload works). 
3. Make external Logo link open in a new window like the Menu-help link to prevent unsaved changes being lost. 
More info: http://www.elijahlofgren.com/silverstripe/alert-users-when-leaving-tab-with-unsaved-changes/ (merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:30:11 +00:00
Ingo Schommer
b1173b174b elofgren: Add back options save code deleted in r36865 because it is used if confirmation=false
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:29:12 +00:00
Ingo Schommer
067d630e06 elofgren: USABILITY: Use a confirm() javascript dialog box instead of the slow loading modal one for asking user if they want to save their changes when they click on a new page in the left tree. More info: http://www.elijahlofgren.com/silverstripe/alert-users-when-leaving-tab-with-unsaved-changes/
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41796 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:28:41 +00:00
Sam Minnee
1bd7dce68a Refactored CMS page-URL accessing to use ->AbsoluteLink(), which can be overridden by defining alternateAbsoluteLink()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41283 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-05 06:42:26 +00:00