Commit Graph

37 Commits

Author SHA1 Message Date
Sean Harvey
4e4810bbb6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75780 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-30 22:47:28 +00: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
Normann Lou
230a70c02a merge open/modules/cms/branches/2.3 changeset 73452
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-24 08:23:09 +00:00
Ingo Schommer
5b0cf968f0 ENHANCEMENT Showing statusMessages via LeftAndMain.js->statusMessage() double as long - they we're dissappearing in a fraction of a second for short strings like "Error"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-12 16:39:25 +00:00
Sean Harvey
31f530cb0f Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71279 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:56:56 +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
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
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
Sean Harvey
2ab7415231 Fixed flash upload fit to parent
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:06:23 +00:00
Sean Harvey
c5241fa487 ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:55: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
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
817d8f8f45 BUGFIX: If ajaxActionsOnTop is called twice, the actions are removed.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64314 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-15 20:47:29 +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
Sean Harvey
7d9bfd8c39 MINOR Fixed JS undefined error with 'Loading' element
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 01:10:38 +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
Saophalkun Ponlu
9381860e9a layout fix: make the status message and ajax button stay in fixed position (ticket #2876)
- position: fixed for #statusMessage  and ajaxActions in ModelAdmin
- commented out this.style.position = "absolute"; in LeftAndMain.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-30 03:04:35 +00:00
Sam Minnee
a9fe1eec6a ENHANCEMENT: Prevent CMS session timing out and losing content - Added a ping to Security/ping every 5 mins, and altered the onSessionLost behaviour to open login form in a pop-up instead of closing the CMS (see #2242)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62995 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-24 04:18:29 +00:00
Ingo Schommer
b9a0a266cc MINOR Changed console.log() to console.error() in ajax error handling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-16 22:08:02 +00:00
Ingo Schommer
9e2de7ba7e ENHANCEMENT Improved ajax error display within the CMS: Using Firebug (or Firebug Lite) for plaintext output instead of cramming everything into the CMS-status field
FEATURE Including Firebug Lite when requested by ?debug_firebug=1 for easy debugging in IE/Opera/Safari- otherwise including fake-objects with FirebugX by default to enable usage of console.* commands without javascript errors

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-16 21:46:08 +00:00
Sam Minnee
e2eee05b83 Added back button to ModelAdmin detail views
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-19 05:18:11 +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
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
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
Andrew O'Neil
9a81e1461d IE hacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44533 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-09 00:50:42 +00:00
Andrew O'Neil
0fc99de98c #1657 - image popup should expand to fill room
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44529 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-09 00:41:10 +00:00
Andrew O'Neil
28d8dfdfaf Move flash, image and link forms to right
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44365 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 05:39:14 +00:00
Ingo Schommer
7ab29414f8 BUGFIX: Changed language-dropdown to normal dropdown-field (wasn't selecting the right languages)
FEATURE: Added "profile"-popup with Member_ProfileForm (see r42730)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 21:16:23 +00:00
Ingo Schommer
25a6aefc9a elofgren: Use CSS padding and some JS hacks to make the AJAX action buttons fit at the bottom of the screen. Now that tabsets are no longer wrapped in a div (to reduce wasted space under tags), there was
no extra space for them. See: http://support.silverstripe.com/gsoc/ticket/59 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42089 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:21:11 +00:00
Ingo Schommer
29cf057e97 mujma: ENHANCEMENT: Swaped alert() during crop to statusMessage().
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42050 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:25:07 +00:00
Ingo Schommer
e741ecd2f8 mlanthaler: Fixes problem that the login form tab is not shown when the (unneeded) BackURL parameter is used (see http://support.silverstripe.com/gsoc/ticket/23 for details).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41892 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:25:07 +00:00
Ingo Schommer
4ede3657e6 elofgren: BUGFIX: Fix bottom tab border collision with action buttons in 'Files & Images' & 'Security' sections in IE. Reported here: http://www.silverstripe.com/google-summer-of-code-forum/flat/1654?showPost=1780#post1780
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:09:54 +00:00
Ingo Schommer
9413acbc05 elofgren: Comment out StatusTitle? code for ajax actions because on IE6, IE7, and Safari 3, the status message becomes 'null' on 2nd hover and because there is not room for long titles when action buttons are on the same line. Now a simple title tooltip is shown instead.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:57:22 +00:00
Ingo Schommer
7f61325204 elofgren: Remove unused code: 1. doYouWantToSave() that called OpenModalDialog?() has been replaced by a call to confirm() 2. CMSMain::savedialog() which was the PHP part of the old modal save dialog. 3. save() in NewsletterAdmin?_right.js which seems to have been replaced by the save function of Form_EditForm
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:32:19 +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
Sam Minnee
62c2237773 Improved ingize() support so that it works on multi-word verbs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@40997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-28 22:03:18 +00:00
Hayden Smith
abb9a61d0d Moved CMS module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:05 +00:00