Commit Graph

68 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
Ingo Schommer
99b0288927 fixed export-feature in MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 03:27:13 +00:00
Normann Lou
018d344ff7 a button need to translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 03:03:15 +00:00
Normann Lou
e11b907ddd a button need to translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 03:01:20 +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
Sean Harvey
54c65ce091 Ticket #1498 - Action param buttons now work in IE7 (applied classes)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44292 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:22:13 +00:00
Sean Harvey
a557f8260d Ticket #1498 - Removed inconsistent ... in labels
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44277 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 20:51:45 +00:00
Sean Harvey
4db20bec83 Ticket #1498 - CSS clean up, use margin reset and remove excess margin 0 and padding 0
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44273 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 10:10:14 +00:00
Sean Harvey
96006c5614 Ticket #1498 - CSS cleanup and template tweak
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 05:03:05 +00:00
Sean Harvey
7c574874ea reinstated clear div as it broke clearing, and tweaks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:30:07 +00:00
Sean Harvey
a129de4c1a Tweaks to version template, styling and more tweaking of inconsistent styling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:12:12 +00:00
Will Rossiter
ad0fa1c84c made titles bold in the site tree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44141 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 01:12:31 +00:00
Sean Harvey
0ca628b33c Ticket #1565 - Removed 'reordering' button on Files and Images as well as Security. Also fixed inconsistent templating on Comments section - it is now consistent with Elijah's GSOC changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44013 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-30 05:16:59 +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
Ingo Schommer
dc84c5a924 fixed indentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42160 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 20:52:56 +00:00
Ingo Schommer
3831c9b651 bfojcapell: replacing strings with _t() calls
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:37:15 +00:00
Ingo Schommer
4fd9b960c5 bfojcapell: removing semicolons in _t() calls
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42136 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:35:09 +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
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
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
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
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
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
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
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
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
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
650317f43f elofgren: Get rid of the large blank space at the bottom of the left frame in the AssetAdmin?, NewsletterAdmin?, and SecurityAdmin? sections.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41945 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:12:05 +00:00
Ingo Schommer
1af0b19db0 elofgren: Remove toggle images in cms/images/panels/ and use the new sapphire/images/ location.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41943 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:09:53 +00:00
Ingo Schommer
e646d31498 elofgren: Fix 'DRAG' image alt text in AssetAdmin? file list and make it simply be 'Drag'.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41928 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:49:23 +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
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
3fc2fc14ec elofgren: USABILITY: Make the 'Site Reports' drop-down use a 'Go' button. Fixes usability issue #12. More info: http://www.elijahlofgren.com/silverstripe/inconsistent-go-buttons/
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:15:08 +00:00
Ingo Schommer
ee61a1776d elofgren: Apply r37456 to Statistics section - Removed scrollbar on sitetree
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41881 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:12:37 +00:00
Ingo Schommer
13bedbcf5e elofgren: USABILITY: Rename first left sidebar section in 'Site Content' to 'Site Content and Structure'.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41880 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:12:12 +00:00
Ingo Schommer
0c895b3a30 elofgren: USABILITY: Make blue title bars in all sections match the ones in 'Site Content' section. Relable 'Files & Images' left frame to 'Folders'.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:10:53 +00:00
Ingo Schommer
b13f8a3963 elofgren: USABILITY: Comment out the blue right frame titles in all of the Admin sections to free up space (since the action buttons have been moved to the bottom, the headings are no longer needed). In addition, comment out the 'My Site' left frame title in the 'Site Content' section since the sub-sections each have their own blue title bar.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:03:23 +00:00
Ingo Schommer
bf5c5154c4 qhoxie: slight stats left panel changes
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41856 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:55:58 +00:00
Ingo Schommer
0762c09ba2 qhoxie: additions to left statistics panel
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:55:36 +00:00
Ingo Schommer
83530f139f elofgren: USABILITY: Change the 'Create', 'Delete', and 'Reorganise' links into 'Create...', 'Delete...', and 'Reorder...' buttons in order to fix Usability Issue #23 "Create, Delete, and Reorganise links
need to be more prominent". More info: http://www.elijahlofgren.com/silverstripe/create-delete-and-reorganise-links-need-to-be-more-prominent/ 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:54:13 +00:00
Ingo Schommer
e1438c9949 qhoxie: updates to stats panels
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:49:54 +00:00
Ingo Schommer
dd853ef168 elofgren: USABILITY: Add 'label' tags for 'Compare mode (click 2 below)' and 'Show unpublished versions' checkboxes in left frame 'Page Version History' section.
(merged from branches/gsoc)


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