Commit Graph

121 Commits

Author SHA1 Message Date
Andrew O'Neil
311479a371 Merged revisions 46927 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.1

........
  r46927 | aoneil | 2007-12-14 18:55:50 +1300 (Fri, 14 Dec 2007) | 2 lines
  
  Leave me
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47293 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:41:15 +00:00
Andrew O'Neil
681a591018 Merged revisions 46142 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.1

........
  r46142 | aoneil | 2007-12-03 11:53:07 +1300 (Mon, 03 Dec 2007) | 2 lines
  
  #1933 - SecurityAdmin_rightbottom.ss template doesn't exist
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:46:28 +00:00
Sam Minnee
cf31a3d4e6 rhalff: #1580 - i18n for comments system
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 22:57:29 +00:00
Andrew O'Neil
1ec701d849 #1815 - The Page view: Edit | Draft Site | Published shouldn't show when it's not relevant (merged from branches/2.2.0@45907, r44977)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:37:28 +00:00
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
Sam Minnee
cbbdd8c412 parents-merge 35478 - Fixed bugs with newsletter import (.CSV didn't work if capital letters, no scroll on import form)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:31:27 +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
Sean Harvey
b6bff63b10 Styling, and tweak to show logged in user even if first name doesn't exist
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44572 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-11 02:43:23 +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
e33cd71485 Ticket #1498 - fail, didn't close span
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44294 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:28:19 +00:00
Sean Harvey
e5a0abf989 Ticket #1498 - Usability fix - span not <a> - can't click it without the href
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44293 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:24:24 +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
3913c747cd Ticket #1498 - display: none for archived site until it's turned on by js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44285 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 21:51:50 +00:00
Sean Harvey
b264b411a2 Ticket #1498 - clean up, added coloured link for links, ensure bottom footer doesn't receive this
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 21:51:17 +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
77be4f43f1 tidy up images and get links at least working now
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44166 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:10:31 +00:00
Jeremy Shipman
ef1457f597 Reverting typography changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:01:40 +00:00
Jeremy Shipman
64749dfd3d added cms_typography.css to replace typography.css in the cms, as it confusues with front end typography.css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 02:14:20 +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
Will Rossiter
afd16bf60b footer styling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-01 23:35:23 +00:00
Sean Harvey
fa94bb8ec2 Removed status box, tweak treepanes css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44123 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-01 22:31:27 +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
Ingo Schommer
2befee113b FEATURE Sapphire files are now also scanned for _t calls
ENHANCEMENT Revised locale list
ENHANCEMENT Updated en_US generated files (and created for sapphire)
BUGFIX Fixed some _t() calls in the cms module

(merged from patch #1476 by bfojcapell)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-20 23:49:14 +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
ca8c9ea955 mujma: BUGFIX: Removed unnecessary closing tags. (merged from gsoc branch, r42521)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42987 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 23:16:53 +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
Jeremy Shipman
63ff9536d1 Created the option of having bbcode in comments.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 02:47: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
ba3d4ab812 initial commit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:41:08 +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
a1bbe0d08e bfojcapell: removing semicolons from _t() calls (not needed now)
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42135 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:34:40 +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
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