Commit Graph

127 Commits

Author SHA1 Message Date
Ingo Schommer
5dc37e418d elofgren: BUGFIX: Fix the following Save/Publish bugs:
"Changed icon only shows after Save button is clicked twice" http://support.silverstripe.com/gsoc/ticket/76 
"Changed icon sometimes shows after "Save & Publish" button is clicked" http://support.silverstripe.com/gsoc/ticket/31 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:02:57 +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
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
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
ae028ac599 elofgren: BUGFIX: Fix Ticket: #56 After Newsletter type is deleted, it should not still be editable in right frame http://support.silverstripe.com/gsoc/ticket/56
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42055 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:29:09 +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
296344fd15 mujma: BUGFIX: Thumbnails are now deleted after saving photo.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42047 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:23:42 +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
706580c443 elofgren: NEW FEATURE: Make it possible to blacklist and remove bounced Newsletter recipients from the Bounced tab of the Mailing List. @TODO: Make this features work corectly in IE.
Make class BouncedList? just extend FormField? like it used to, extending TableListField? added unneeded complexity. 
Remove the unused Save button from the 'Mailing List' section. Fixes gsoc track ticket: #26 Remove uneeded "Save" button in "Mailing List" section of Newsletters 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42039 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:17:51 +00:00
Ingo Schommer
be99502d53 elofgren: NEW FEATURE: Log any attempts to send Newsletters to Emails that are blacklisted and show a 'Sending to the Following Recipients Did Not Occur Because They Are BlackListed?' report on the 'Sent Status Report' of Newsletters.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42038 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:17:14 +00:00
Ingo Schommer
bba347331f elofgren: Make it so that if red (X) link next to an Email on the Bounced Tab of a Mailing List is clicked, the Email_BounceRecord will be deleted and the Member will be removed from the Mailing List group. @TODO Reload whole right frame so that Recipients and Bounced tabs will be updated after bounced member is removed.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42037 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:16:47 +00:00
Ingo Schommer
e28baf03db mujma: ENHANCEMENT: Added SWFUpload library as default method of uploading files.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42014 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:40:26 +00:00
Ingo Schommer
3a0d2596c9 elofgren: Make class BouncedList? extend TableListField? so that checkboxes and red 'X' icon links will show. @TODO Make it possible to disable sending to bounced emails by unchecking a box and delete the email from the mailing list by clicking the red X @TODO Try to find way to show Firstname and Surname under a 'Username' heading
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42012 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:36:04 +00:00
Ingo Schommer
a42fd1d2d2 mujma: ENHANCEMENTS: Now image is placed in scrolled container so operation that results in image larger than screen are no longer problem.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:30:43 +00:00
Ingo Schommer
456ce4ebcc elofgren: In Newsletter_SentRecipient, instead of putting 'MemberId?' in $db put 'Member' in $has_one in order to be consistent with Newsletter_Recipient and Email_BounceRecord. This does not change the structure of the Newsletter_SentRecipient table, but does add an Index on the MemberID column.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42005 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:05:04 +00:00
Ingo Schommer
170c5b1fba elofgren: Make the status message shown after sending a newsletter always include the # of emails sent.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:04:10 +00:00
Ingo Schommer
b784ccc5e7 elofgren: Clean up the code which enabled the 'Send to only people not previously sent to' feature committed in r38895
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:03:04 +00:00
Ingo Schommer
24ed3ff68b elofgren: NEW FEATURE: Add 'Send to only people not previously sent to' option for sending Newsletters. Please test. :)
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:02:32 +00:00
Ingo Schommer
2c012f3c4e elofgren: BUGFIX: Fix gsoc trac ticket: #54 For newly created Newsletter drafts, Content of Newsletter Sent is not what is shown on screen (Save button has to be clicked)
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:01:06 +00:00
Ingo Schommer
8e583e2a4d elofgren: Don't show a 'No template selected' error when sending a test Newsletter if no template has been selected since templates for Emails are optional. See Email::parseVariables(). Resolves gsoc trac ticket: #53 "No template selected" error only occurs when "Send test to", but not when "Send to the mailing list" is selected
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41998 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:00:10 +00:00
Ingo Schommer
137f302fbc elofgren: Remove 6 lines of code by directly passing the unsent_subscribers_array data to push(new ArrayData?($data)) instead of pointlessly creating a new array.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:58:31 +00:00
Ingo Schommer
4deaf09212 elofgren: Track whether mail() returns TRUE or FALSE when a Newsletter is sent and record the result in a new Newsletter_SentRecipient table.
Add a 'Sent Status Report' tab to Newsletters that shows the following 4 reports: 
* Sending to the Following Recipients Failed 
* Sending to the Following Recipients Bounced (@TODO: Make bounces actually show up here) 
* The Newsletter has Never Been Sent to Following Subscribers 
* Sending to the Following Recipients was Successful 
More info: http://support.silverstripe.com/gsoc/wiki/GSoc07UsabilityElijah 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41995 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:57:31 +00:00
Ingo Schommer
d6ef666925 mujma: ENHANCEMENTS: Tmp folder name changed to _tmp, depends on r38621 in sapphire branch.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41993 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:53:45 +00:00
Ingo Schommer
bcbdd364e0 elofgren: BUGFIX: Fix bug 'Errors when Importing Recipients to Newsletter Mailing List'. Fixes gsoc trac ticket #38. Tested and importing newsletter recipients works in FF2 and IE7. Reported here: http://www.silverstripe.com/bugs/flat/1470 This fix needs GenericEmail?.ss added in r38503
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41970 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 22:02:06 +00:00
Ingo Schommer
cff0c9186c elofgren: VAR FIX: Initialize 'colCount' to prevent error when importing Newsletter Recipients.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41965 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:57:33 +00:00
Ingo Schommer
f7a1b199db elofgren: BUGFIX: Fix issue with deleting pictures with 'X' delete link not removing thumbs in _resampled folder. Thanks to Mateusz for reporting this.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41964 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:57:11 +00:00
Ingo Schommer
abca2d257a mlanthaler: Bugfix: Fixed E_NOTICE error due to uninitialized variable
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41960 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:54:24 +00:00
Ingo Schommer
dcc83f8ff3 elofgren: BUGIX: Fix trac ticket: '#28: Fix problems with adding a new newsletter type and trying to edit its title' by making the id of the new newsletter type be returned instead of the id of Session::get('currentPage')
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41949 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:14:17 +00:00
Ingo Schommer
9d0cf998e1 elofgren: Adds 'Newsletter Settings' tab to Newsletter type edit form for consistency with other forms. Closes Ticket #30: Add tab to 'newsletter type' edit form
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41948 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:13:53 +00:00
Ingo Schommer
9f633edd49 elofgren: VAR FIX: Initialize 'result' in ThumbnailStripField::getflash()
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41947 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:13:23 +00:00
Ingo Schommer
c09c1050e4 elofgren: VAR FIX: Prevent undefined variable 'resent' in NewsletterEmailProcess::complete()
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41944 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:11:36 +00:00
Ingo Schommer
7463a8fb05 elofgren:Display a useful error message if getCMSFields() returns null. Thanks Sam: http://www.silverstripe.com/general-discussion/flat/1537?showPost=2042#post2042
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:09:13 +00:00
Ingo Schommer
3cae2fb249 elofgren: USABILITY: Fix usability issue #48 "Delete and Move Files buttons need repositioning"
Changes: 
* Remove the 'Move Files' button and enable multi-file drag and drop file moving 
* Position the 'Delete selected files' button under the checkboxes and make it turn red on hover 
* Add 'Ctrl' and 'Shift' range selection to file checkboxes 
* Add 'X' delete links to the right of each file 
* Rename the 'Save' button to 'Save folder name' and don't show it when listing 'assets' folder since it can't be renamed 
More info: http://www.silverstripe.com/google-summer-of-code-forum/flat/1607
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:47:35 +00:00
Ingo Schommer
dc45dd0c25 mujma: Added deleting thumbnails after moving a photo.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41924 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:30:54 +00:00
Ingo Schommer
1b5c8ee6a8 qhoxie: basics of tabular data for stats
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:23:50 +00:00
Ingo Schommer
be4ed16a0c bfojcapell: strings replaced by calls in the Site Content area. The regenerated master string table and a spanish translation are also added. Always, if you get any kind of blank string, just regenerate en_US.php by visiting /i18n/text_collector
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:21:13 +00:00
Ingo Schommer
eb73802bcd mlanthaler: Bugfix: Added isset() to prevent E_NOTICE error.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:11:06 +00:00
Ingo Schommer
d5d2006980 mlanthaler: Bugfix: Added isset() to prevent E_NOTICE error ($memberID isn't needed in the rest of the method).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:10:43 +00:00
Ingo Schommer
7ee0ec6158 bfojcapell: using new default locale and function name
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41908 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 02:08:42 +00:00
Ingo Schommer
a6824938b3 mujma: Added deleting of image thumbnails after delete operation.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:29:38 +00:00
Ingo Schommer
356f4cc4bc mujma: ImageEditor?.php adjusted to standards, Image.js improved resizing of large images.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41898 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:28:50 +00:00
Ingo Schommer
15ed167583 bfojcapell: default language file
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:27:57 +00:00
Ingo Schommer
be9fff205e bfojcapell: lang folder, and some strings being translated to test i18n
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:27:29 +00:00
Ingo Schommer
f436292174 mujma: Added support for large images (larger than browser window).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41894 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:26:36 +00:00
Ingo Schommer
31a9fbee3c mujma: Fixed various browser compatibility problems. Now should work on Safari 3.0.2 /Windows, FF 1.5/2.0 Windows/Linux.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41891 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:19:43 +00:00
Ingo Schommer
561a3cd4ba sharvey: 'Send newsletters from' doesn't describe what you need to type in - 'From email address' describes it better
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:17:04 +00:00
Ingo Schommer
3818d8f961 sharvey: Name wasn't specific enough - Folder Name makes it easier to understand
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:16:04 +00:00
Ingo Schommer
1335c66e65 isharvey: moved field into tab for consistency with newsletter system
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41886 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:15:35 +00:00