Commit Graph

44 Commits

Author SHA1 Message Date
Sam Minnee
d1ead49133 #1056 - Fixed deletefromlive messages with quote in title
Fixed Convert::raw2js() for strings containing slashes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 05:16:10 +00:00
Andrew O'Neil
1396764915 Special Characters Error Fixing In Translate Mode (merged from branches/2.2.0@45907, r45259)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:37:42 +00:00
Andrew O'Neil
59c8237efd Change remaining references to 'Sitemap' to 'GoogleSitemap'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46088 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:22:43 +00:00
Normann Lou
dd0f2f72be comment out Sitemap::ping() since it has been fixed in 2.2-rc2 and have not merge back yet.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-27 21:41:23 +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
584481c100 parents-merge 33200 - Fix duplicate page with multiple parents
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:20:05 +00:00
Andrew O'Neil
b4fc0105e4 #1801 - search provides all results back, not a filtered search (merged from branches/2.2.0, r44867)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:46:52 +00:00
Normann Lou
da2b28b180 new lang files updated from translateserver. Date ago() translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 06:05:52 +00:00
Normann Lou
e5ad6ab87a SiteTreeFilterOptions needs to be translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 23:28:54 +00:00
Ingo Schommer
9e5c9ce323 i18n: entity update
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44290 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:19:20 +00:00
Sam Minnee
0b0eadaf1d #1576 - New pages are created in the database straight away
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44147 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 01:52:04 +00:00
Andrew O'Neil
104e29c9fa #1482 - Email link doesn't work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 00:55:52 +00:00
Andrew O'Neil
7412274587 #1481 - Buttons overlap content area when viewing history
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 00:30:43 +00:00
Ingo Schommer
5966b2c0d6 #1485 Changing the name of a group results in javascript error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43880 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-26 03:00:21 +00:00
Ingo Schommer
bfe092ecdd ENHANCEMENT Changed page dropdown labels from "Add a page" to "page" (doesn't work out with i18n)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 03:03:14 +00:00
Andrew O'Neil
5b7301b2db GSOC #118 - Coding Conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 01:10:31 +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
Andrew O'Neil
e5060b6d30 Fix php notice (merged from 2.1.0 branch, r42205)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42933 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:08:36 +00:00
Ingo Schommer
bdf7da1842 removed debug-code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42746 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 22:39:45 +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
d3cc97c8a0 Added _manifest_exclude to lang folder (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42577 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 21:58:42 +00:00
Ingo Schommer
8fab54429f renamed cmsMainMarkingFilterFunction(), fixed php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42306 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-19 14:04:50 +00:00
Ingo Schommer
78ed0a0795 code formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42161 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 20:53:31 +00:00
Ingo Schommer
8425e69757 bfojcapell: Avoid improductive DB interaction when creating a translatio
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42151 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:02:47 +00:00
Ingo Schommer
f059655888 bfojcapell: support for the multilingual feature
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42133 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:32:30 +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
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
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
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
15d40c5cf1 elofgren: USABILITY: Rename 'Save draft' button to 'Save' and make 'Publish' (will be renamed 'Save & Publish') button save the new draft in addition to publishing it.
Requested here: http://www.silverstripe.com/google-summer-of-code-forum/flat/1654?showPost=1730#post1730 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:00:03 +00:00
Ingo Schommer
dfa6b99f18 elofgren: VAR FIXES: Fix 2 undefined variable errors in CMSMain::deletefromlive() and 1 in CMSMain::deleteitems() that showed up in status messages while deleting pages.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:46:22 +00:00
Ingo Schommer
7f61325204 elofgren: Remove unused code: 1. doYouWantToSave() that called OpenModalDialog?() has been replaced by a call to confirm() 2. CMSMain::savedialog() which was the PHP part of the old modal save dialog. 3. save() in NewsletterAdmin?_right.js which seems to have been replaced by the save function of Form_EditForm
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:32:19 +00:00
Ingo Schommer
1bff08f5d2 wscott: The cms will now ping google with sitemap updates when pages are published or unpublished (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41700 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 01:19:13 +00:00
Andrew O'Neil
0538bc2595 Add back the lines deleted in r41205
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41420 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-07 00:20:22 +00:00
Sam Minnee
1bd7dce68a Refactored CMS page-URL accessing to use ->AbsoluteLink(), which can be overridden by defining alternateAbsoluteLink()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41283 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-05 06:42:26 +00:00
Romain Louis
e7a56ece26 RelationComplexTableField.js and GalleryPage_CMS.js requirements adding
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-04 03:42:59 +00:00
Sam Minnee
b747f9c42e Moved callPageMethod to leftandmain, so that I can use it in other CMS controllers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@40907 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-27 05:06:57 +00:00
Andrew O'Neil
112d7ed1ad Moved widgets into core
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39562 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-02 22:07:11 +00:00
Andrew O'Neil
6a0d8a70ea Fixed php notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39332 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-27 05:26:00 +00:00
Andrew O'Neil
85313b7e49 Renamed WidgetAreaField to WidgetAreaEditor, made it more like FieldEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39237 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-25 01:25:47 +00:00
Andrew O'Neil
8f07141313 Started the Widget area in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-24 06:23:01 +00:00
Andrew O'Neil
d53ea72c34 Use themed typography in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 23:45:53 +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