Commit Graph

137 Commits

Author SHA1 Message Date
Andrew O'Neil
5d52994004 #1483 - Rollback dialog uses lightbox, while rest of dialogs use javascript boxes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43931 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 01:58:01 +00:00
Andrew O'Neil
b6d828a2d6 #1514 - JavaScript error when closing Page Version History section
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 01:13:21 +00:00
Andrew O'Neil
7d2e079fd4 #941 - Security flaw: SS prone to CSRF attack
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-28 21:44:38 +00:00
Ingo Schommer
1e4c2a5caf #1487 Incorrect dialog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43882 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-26 03:11:37 +00:00
Andrew O'Neil
499a951b69 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43881 467b73ca-7a2a-4603-9d3b-597d59a354a9 2007-10-26 03:04:45 +00:00
Andrew O'Neil
5e41feeca1 GSOC #116 - Refactor StatisticsAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43831 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 01:03:17 +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
Andrew O'Neil
5868bb1e8f GSOC #99 - Switch TinyMCE languages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-07 23:48:05 +00:00
Andrew O'Neil
b0d78ea5bd mujma: BUGFIX: All global variables added to ImageEditor namespace, solved issue reported in ticket 102, http://support.silverstripe.com/gsoc/ticket/102 (merged from gsoc branch, r42789)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42989 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 23:26:35 +00:00
Andrew O'Neil
04bc8e6b77 mujma: BUGFIX: Added comments for better description of files usage. Trac ticket: http://support.silverstripe.com/gsoc/ticket/107. (merged from gsoc branch, r42515)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42986 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 23:08:38 +00:00
Andrew O'Neil
6aed530816 mujma: ENHANCEMENT: Added garbage collection (merged from gsoc branch, r40463, r42790, r41070)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 21:34:57 +00:00
Andrew O'Neil
f9b314d662 Fixed CMS sort sub-pages bug
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42935 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:10:35 +00:00
Andrew O'Neil
997f3d09d0 Reverting, problem isn't fully fixed (merged from 2.1.0 branch, r41586)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:07:42 +00:00
Andrew O'Neil
958b1d5a9d hack to fix TinyMCE not resizing properly on load (merged from 2.1.0 branch, r41582)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42931 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:07:02 +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
5816ce849f additional check for existence of #Form_EditForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42727 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:49:03 +00:00
Ingo Schommer
d3cc97c8a0 Added _manifest_exclude to lang folder (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42577 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 21:58:42 +00:00
Ingo Schommer
d1dafb9ff1 bfojcapell: javascript files for multilingual support
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:30:26 +00:00
Ingo Schommer
e4fedc6bad qhoxie: stats admin organization
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42129 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:29:04 +00:00
Ingo Schommer
3090ae956d qhoxie: added user activity graph
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42128 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:27:36 +00:00
Ingo Schommer
b3da227764 qhoxie: fixed prototype 1.5.x issues for plotting, drops 1.4.x for stats page only, rework of stats admin css
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:24:45 +00:00
Ingo Schommer
bdb4e5ae65 qhoxie: revamped tablesorting, copious js fixes, cms stats reword progress
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42126 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:24:02 +00:00
Ingo Schommer
dd02cd2945 mujma: BUGFIX: All uploading was directed to root folder - fixed.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42090 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:21:41 +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
54b428e6d3 elofgren: NEW FEATURE: Add 'Show only changed pages' checkbox above 'Publish the selected pages'
button under 'Bulk Actions'. Note: Pages that have children will always be 
shown in case, their children have been changed. 
Suggested here: http://www.silverstripe.com/silverstripe-development/flat/3799?showPost=4092#post4092 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42087 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:20:02 +00:00
Ingo Schommer
a56657fb83 elofgren: NEW FEATURE: When 'Search' button is clicked show a simple search text input and button which allow for filtering the Site Tree by searching the URL, Title, Menu Title, and Content.
Also show an 'Add criteria...' drop-down with 'Page Type', 'Status', 'Description', and 'Keywords' options which allow for more fine grained filtering based on columns in the SiteTree? table. 
In addition add an 'Edited Since' option which uses a CalendarDatePicker? which allows for filtering pages based on when they were last edited. 
NOTE: Pages that have children will always be shown whether they match the filter or not, in case one of their children matches the filter. It would probably be better to switch to a flat 
display of the results. 
More info: http://www.silverstripe.com/google-summer-of-code-forum/flat/2526 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:19:17 +00:00
Ingo Schommer
c0a7eba5ab elofgren: Add 'TODO: Remove 'new-' code http://open.silverstripe.com/ticket/875' comment.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:05:25 +00:00
Ingo Schommer
ed9bca2c68 elofgren: NEW FEATURE: Replace the 'Delete...' button with a 'Batch Actions' button and add a 'Publish the selected pages' button.
See: http://www.silverstripe.com/google-summer-of-code-forum/flat/1636?showPost=1859#post1859 
And: http://www.silverstripe.com/silverstripe-development/flat/3799?showPost=4070#post4070 
TODO: Make the new 'Search' button functional. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:04:09 +00:00
Ingo Schommer
b456ca5829 elofgren: Replace the 'Reorder...' button with a 'Allow drag & drop reordering' checkbox as per:
http://www.silverstripe.com/google-summer-of-code-forum/flat/1636?showPost=1859#post1859  
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:00:08 +00:00
Ingo Schommer
9fcd82f172 mujma: ENHANCEMENTS: Added comments.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:36:42 +00:00
Ingo Schommer
a218320f42 mujma: REFACTORING: Added support for Upload object, code reduction 70 lines.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42066 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:36:16 +00:00
Ingo Schommer
45a9105a28 mujma: REFACTORING: Removed apostrophes.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:35:30 +00:00
Ingo Schommer
5c89bbcb58 elofgren: ENHANCEMENT: Added support for canceling and starting upload.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:34:55 +00:00
Ingo Schommer
d445e1d462 ENHANCEMENTS: I have added Upload object which handles most common tasks for uploading files.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42063 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:34:08 +00:00
Ingo Schommer
7f4dd7279b elofgren: USABILITY: Make 'Add new draft' the default action for 'Create...' in the Newsletter section. Also make 'Add new draft' be selected whenever a selection is made in the left tree. Only select 'Add new type' by default if there are no Newsletter types. This will reduce confusion and make the more common 'Add new draft' action easier since it will be the default. Also select the 'Add new draft' option after a Newsletter type is added since this will be the next logical action. This fixes GSoC trac ticket: http://support.silverstripe.com/gsoc/ticket/70
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42061 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:32:33 +00:00
Ingo Schommer
a1fcfa6271 elofgren: BUGFIX: If there are no Newsletter types, and 'Add new draft' is chosen, create a Newsletter type to prevent errors. This makes either drop-down option work.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42060 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:31:41 +00:00
Ingo Schommer
e63c16fcff elofgren: BUGFIX: If no selection is made in the left tree, and a draft is added, parentID won't be set, so don't rely on it being set in Javascript and instead add a hidden ParentID field that is returned by PHP and use that so it is alway set correctly. This solves a bug where Newsletter drafts will be added, but not show up in the left tree (because of a Javascript error), if no selection has been made.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42059 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:31:06 +00:00
Ingo Schommer
70ae154609 elofgren: BUGFIX: Fix trac ticket: #66 Error when "Restore" button is clicked after a page is "Removed from the draft site" http://support.silverstripe.com/gsoc/ticket/66
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:29:34 +00:00
Ingo Schommer
3501d6a57b elofgren: BUGFIX: Add if((typeof tinyMCE != 'undefined')) statement around call to tinyMCE.init() to prevent "Error: 'tinyMCE' is undefined" error in IE7 on Newsletter Recipient import. .
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42054 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:28:40 +00:00
Ingo Schommer
4167ab9108 elofgren: BUGFIX: Don't save new Newsletter drafts as soon as they are created to prevent TinyMCE Javascript errors in IE. Always save Newsletter drafts before sending to prevent unsaved newsletter drafts from being sent out completely blank because change detection for new newsletter drafts does not work in IE.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42053 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:28:14 +00:00
Ingo Schommer
f72e6d9a56 elofgren: In order to fix: http://support.silverstripe.com/gsoc/ticket/58 "Add" button is broken after reloadRecipientsList() is called do the following:
After recipients are imported, show a link to "reload the Mailing List" which calls reloadRecipientsList() instead of doing it automatically. 
Simply call getPageFromServer() and focus the Recipients tab, instead of only reloading the Recipients tab. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:27:39 +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
4fd3e3510a elofgren: Use onclick instead of onchange event so that blacklist add/removing is immediately called by IE when checkboxes are clicked on the 'Bounced' tab of the 'Mailing List' section of the 'Newsletters' section.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:24:38 +00:00
Ingo Schommer
2d04f8e14b mujma: ENHANCEMENT: Added preserving ratio during resize.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42048 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:24:11 +00:00
Ingo Schommer
030b55d750 mujma: ENHANCEMENTS: Added new design for ImageEditor?.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42046 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:23:10 +00:00
Ingo Schommer
09ef2f0963 mujma: ENHANCEMENT: Added photo upload in TinyMCE editor.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42045 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:21:47 +00:00
Ingo Schommer
5575c175de elofgren: Use simply 'group' instead of 'security group' for consistency in alert about no groups being selected when 'Delete the selected groups' is clicked.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:20:08 +00:00
Ingo Schommer
0438c5006d elofgren: Added delete confirmation for items in Security left tree. As part of fix for gsoc trac ticekt: #51 Warning is needed before items are deleted from security & newsletter tree
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42043 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:19:43 +00:00
Ingo Schommer
08974ae348 elofgren: Fix wording on alert() shown when Delete button is clicked in NewsletterAdmin?.js left to refer to 'security group' instead of 'Page'
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42042 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:19:09 +00:00
Ingo Schommer
95c9255395 elofgren: Fix wording on alert() shown when Delete button is clicked in NewsletterAdmin?.js left to refer to 'Newsletter item' instead of 'Page'
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42041 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:18:43 +00:00