Commit Graph

31 Commits

Author SHA1 Message Date
Normann Lou
a3f9d9b6d3 switch externals to trunk.
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk 
r32483: merge 2.0infom with lastes chunk 
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block 
r33580: styling for combined form communication in myinfom pages 
r33706: styling of combined form (communication) in Email 
r33881: made compatible to $extraClass 
r33885: added defaultVal
r33887: fixed typo 
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class 
r34914: WIP3866: Factfinder: Hide "self emplyed" block 
r34964: Change current plan upto TraumaInsurance? 
r35038: disabled friggin field focus 
r35230: #1032 Fixed hash-link insertion 
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion) 
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField 
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code 
r36826: change wrong indent format 
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode 
r40815: add an unsubscribe record when a member subscribe a newslettertype 
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31: CRM not showing search results
r43226: fixed search (partial merge from trunk) 
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 01:10:19 +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
Ingo Schommer
0fddddb87e !!BUGFIX: Refactored CSS and Requirements: Created more specific css-files to reduce side-effects and ease debugging, moved generic form-styling from cms/css/cms_*.css into sapphire/css/Form.css.
!!BUGFIX: Ordered Requirement-inclusions in CMSMain/LeftAndMain to be more coherent (avoiding duplicate Requirement-calls)
ENHANCEMENT: Removed some css-rules disabled by comments
ENHANCEMENT: coding-conventions (see r42726)
FEATURE: Added Profile-page with LeftAndMain->myprofile()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42728 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:56:55 +00:00
Ingo Schommer
83d500865e bfojcapell: strings replaced with _t() calls
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:33:05 +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
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
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
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
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
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
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
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
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
1741cf99cb elofgren: Make Newsletter AJAX action buttons be update after submit like happens in all other sections of the Admin. Use 'form_actions_right' instead of 'form_actions' and remove unneeded duplicated 'Form_EditForm_action_save' Behaviour.register in NewsletterAdmin?_right.js
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41878 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:11:25 +00:00
Ingo Schommer
dbb645cde6 elofgren: BUGFIX: Make adding a newsletter type to the 'Newsletters' tree work when a draft is selected by changing the name of the 'NewsletterEditForm?' back to 'EditForm?' (reverts r36734 which was a fix to make the 'Save changes' button work on the now non-existant modal 'Usaved changes' dialog.) In addition this commit reverts r37173 because the form name is now 'EditForm?' like all other forms in NewsletterAdmin?.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:53:38 +00:00
Ingo Schommer
05a8a40e01 elofgren: BUGFIX: Fix status message displayed after deleting items from the left 'Newsletters' tree. Instead of 'Deleted items', actually give a value to and display it as a number.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41851 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:51:37 +00:00
Ingo Schommer
9792c6bf37 elofgren: Add ellipsis (...) to Newsletter Send button to be consistent with 'Move Files...' button.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:28:03 +00:00
Ingo Schommer
74214051b8 mlanthaler: Changed the login messages to reflect the fact that more authentication methods are available.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:26:56 +00:00
Ingo Schommer
19e222b5c2 elofgren: BUGFIX: In NewsletterAdmin::getNewsletterEditForm() use 'NewsletterEditForm?' instead of 'EditForm?' as the name of the form so that clicking 'Save changes' in the 'Unsaved Changes' reminder popup will actually save the Newsletter draft. (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 18:12:42 +00:00
Ingo Schommer
4c0681927d elofgren: Instead of setting className= in NewsletterAdmin?'s save() and savenewsletter() functions (in order to fix an undefined variable problem earlier), set it to 'NewsletterType?' in save() and 'Newsletter' in savenewsletter(), and then use those values in both calls to DataObject::get_one() (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 18:12:00 +00:00
Ingo Schommer
1eca17e0a9 elofgren: USABILITY: Rework the tabs in the Newsletter section to be less confusing as per issue #57 of the Usability Report
Includes the removal of all tabs and submit action buttons when 'Drafts' or 'Sent Items' are clicked and the addition of an 'add one' link on 'Drafts' folder page. 
For more information see: http://www.elijahlofgren.com/silverstripe/newletter-tree-and-tab-row-are-confusing/ 
Includes a few fixes for undefined variables.  (merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41772 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:29:08 +00:00
Sam Minnee
6c4a2e24aa Refactored newsletter system to put recipient selection and form-fieldset generation into the NewsletterType class, to allow for subclassing NewsletterType to create special system newsletters. [see oriwave2 for an example]
Removed a number of notice-level errors.
Allowed for BOUNCE_EMAIL to not exist and bounce-handling to be disabled.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@40963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-28 01:55:45 +00:00
Normann Lou
628105c410 add more strict condition inside getNewletterTypeEditForm to make NewsleterAdmin more robust.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@40816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 03:50:17 +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