tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
3,352 Commits 29 Branches 403 Tags 28 MiB
c5b5d5cc5f
Commit Graph

3352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d17251a311 elofgren: On Newsletter Mailing List Bounced tab: Change 'Last bounce at' column label to 'Date' to be more accurate because multiple bounce records will be shown for a member if their email has bounced 
more than once. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42058 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 02:30:33 +00:00
Ingo Schommer
57f6174967 elofgren: On Newsletter 'Mailing List' 'Bounced' tab: Change instructions from "Uncheck the box to *disable* sending to an email address." to "Uncheck the box to *enable* sending to a *blacklisted* email 
address.", label checkbox column as Blacklisted, and show the checkbox checked if Member.BlacklistedEmail? is true. This makes things easier to understand and correctly complies with spec: 
"Bounces report with tickboxes ticked by default (to not send to in the future, unticking resends)" 

(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42057 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 02:30:08 +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
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
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
e176c2c265 mujma: BUGFIX: Iframe shouldn't "jump" after clicking on link (problem under Safari and IE6/7) 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42051 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 02:25:32 +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
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
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
Ingo Schommer
6cb2df64dd elofgren: Added delete confirmation for items in Newsletter 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@42040 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 02:18:18 +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
7a996450e6 elofgren: Make 'Email' colum always be 1/3 of width of table and listed first in every report for consistency on Newsletter 'Sent Status Report' tab. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42013 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:36:31 +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
6714eea295 elofgren: Add style="width:auto;" to the 'Sending to the Following Recipients Failed' and 'Sending to the Following Recipients Bounced' headings in the 'Sent Status Report' tab so they are not always width:50%. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42011 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:35:26 +00:00
Ingo Schommer
29cecf3845 elofgren: Remove the 'Firstname' and 'Surname' colums from all reports except the 'The Newsletter has Never Been Sent to Following Subscribers' one on the 'Sent Status Report' tab since it wasn't showing and I can't get the MySQL join working right. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42010 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:31:51 +00:00
Ingo Schommer
094c3629f1 elofgren: Remove '@TODO: Make bounces actually show up here.' from above 'Sending to the Following Recipients Bounced' heading in the 'Sent Status Report' tab of Newsletters since bounce logging for Newsletters was implemented in r39232 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42009 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:31:07 +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
1daba65357 elofgren: Fix indentation of code in AddForm::form_submit() 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42007 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:30:05 +00:00
Ingo Schommer
ed0232eb71 elofgren: BUGFIX: Make adding newsletter types work again (was broken by r38923). Fix long-standing problem of whole page reloading when adding a Newsletter type. Now it is always added via AJAX. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42006 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:29:40 +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
5303c3ba2f elofgren: BUGFIX: Make 'Sent Status Report' tab be reloaded after a Newsletter is sent 'to only people not previously sent to' 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42004 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:04:35 +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
03423e67be elofgren: Add 'Firstname' and 'Surname' columns to all Sent Status report tables. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42000 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:01:27 +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
226afd84ba mlanthaler: Bugfix: The TinyMCE buttons shouldn't be underlined (spaces produce an ugly _ at least in IE7). 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41996 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:58:02 +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
07c4301ca7 elofgren: USABILITY: Add <label for=...> tags to 'Send to the mailing list' and 'Send test to' radio buttons. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41994 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:54:16 +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
0f7cf9628c mujma: BUGFIX: No longer photo under FF/Linux can be dragged out of dragging area. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41992 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:52:11 +00:00
Ingo Schommer
cd124fe98a mujma: BUGFIX: Any redo are now working after applying new operation. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41991 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:51:43 +00:00
Ingo Schommer
5150e6c6b6 mujma: BUGFIX: Fixed image flickering under IE6 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41990 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:51:15 +00:00
Ingo Schommer
8e08868354 mujma: BUGFIX: Fixed buttons(Ok/Cancel) visibility after "Crop area to small" message. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41989 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:50:48 +00:00
Ingo Schommer
5c3e3b1d6b mujma: ADD-ON: Removed image toolbar under IE6 
(merged from branches/gsoc)


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