Commit Graph

233 Commits

Author SHA1 Message Date
Ingo Schommer
d91759d958 API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller (from r113282)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@113318 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:29 +13:00
Ingo Schommer
ace268df39 BUGFIX Attribute escaping in PageCommentInterface?_singlecomment.ss (merged from r97071)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@97074 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Normann Lou
a10b7018dd APICHANGE: move SubscribeSumission.ss from cms module to newsletter module, cos it is only used by newsletter module.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@91130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Normann Lou
b3b0b92724 MINOR: add if condition to the SubscribeSubmission template
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@91109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:28 +13:00
Brent Neave
816ae894d9 MINOR: Reverted r86878
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@86882 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Brent Neave
85a524abcb MINOR: CSS and templating. Added Cufon font replacement script to render h1 and h2 in DTL Argo Bold font.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@86878 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:27 +13:00
Will Rossiter
6b83125b41 MINOR: removed userform specific template out of cms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@82001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:25 +13:00
Sean Harvey
a0b19eca51 BUGFIX Fixed invalid HTML in AssetAdmin_uploadiframe.ss which could have an effect on file uploads
ENHANCEMENT Removed JS generated from PHP code in AssetAdmin::UploadForm() and placed it into AssetAdmin_uploadiframe.ss



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@80863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:24 +13:00
Hamish Friedlander
29ab106af8 ENHANCEMENT: Correct issue with SiteTree filtering not persisting and add drop down for page type and clear button. Part of a re-work of the search system
@todo: Tests, speed optimisation, proper connection of filtering with tree control checkboxes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
0518e205c7 API CHANGE: Made batch actions pluggable through CMSBatchActionHandler::register()
ENHANCEMENT: Added batch actions for unpublish and delete from published.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76666 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
812fad5964 BUGFIX: Fix modeladmin scrollbars in ie7
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sam Minnee
820d6b92cd ENHANCEMENT: Added 'show deleted pages' function to CMS, with a restore page option.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:17 +13:00
Ingo Schommer
74fad6a1d0 Merging refactored Translatable from trunk, and related changes to CMSMain
------------------------------------------------------------------------
r69959 | ischommer | 2009-01-11 01:15:30 +1300 (Sun, 11 Jan 2009) | 18 lines

Merged, debugged and enhanced Translatable patches from branches/translatable at r64523, r64523, 64523, thanks wakeless!
API CHANGE Changed Translatable schema from auxilliary tables (SiteTree_lang, SiteTree_lang_Live) to automatically filtered records on the original table (SiteTree, SiteTree_Live), using $Lang and $OriginalID properties. Incompatible update to old schema, migration script is in the works.
API CHANGE Removed Translatable::get_one(), Translatable::write()
ENHANCEMENT Simplified Translatable tree generation by using getSiteTreeFor() in CMSMain->createtranslation()
ENHANCEMENT Added AllChildrenIncludingDeleted(), augmentNumChildrenCountQuery(),  augmentAllChildrenIncludingDeleted(), augmentStageChildren() to Translatable class to allow for more stable tree generation.
ENHANCEMENT Moved definition of Translatable schema from augmentDatabase() to Translatable->extraStatics()
ENHANCEMENT Changes to the CMS language selection refresh the whole admin interface instead of the tree only. This way we can add a URL parameter ?lang=<lang> to /admin, which makes the specific language bookmarkable and reloadable. Changes to LangSelector.js
ENHANCEMENT Added fallback to ModelAsController->getNestedController() to fetch page with matching URLSegment but different language in case no page is found in the current language.
ENHANCEMENT Added helper methods to Translatable: getTranslation(), hasTranslation(), isTranslation(), findOriginalIDs()
ENHANCEMENT Getters and setters for Translatable->getOriginalPage() etc.
ENHANCEMENT Hooking Translatable into ModelAsController and ContentController initialization in order to call choose_site_lang()
ENHANCEMENT Simplified Translatable->augmentSQL(), augmentWrite() by not using auxilliary tables
ENHANCEMENT Showing clickable links for Translations in Translatable->updateCMSFields()
BUGFIX Modifying Hierarchy/SiteTree Children getters to accept optional "context" which can be used to set a language explicitly through the $Lang property, rather than implicitly reyling on the static Translatable::current_lang()
BUGFIX Fixed TranslatableTest to work with new datamodel
BUGFIX Temporarily disabled cookie/session selection in Translatable::choose_site_lang() until we have a good test suite for the side effects.
MINOR Added "untranslated" CSS styles to tree nodes and marking them as inactive/grey

------------------------------------------------------------------------
r70307 | ischommer | 2009-01-16 17:16:19 +1300 (Fri, 16 Jan 2009) | 2 lines

ENHANCEMENT Simplifying creation logic of new languages in CMS by reloading complete interface, rather than refreshing partial interface, language dropdown etc.
API CHANGE Removed CMSMain->switchlanguage()
------------------------------------------------------------------------
r70308 | ischommer | 2009-01-16 17:17:37 +1300 (Fri, 16 Jan 2009) | 2 lines

ENHANCEMENT Moved language selector in CMS above tree for better visibility, added padding and adjusted dropdown width
ENHANCEMENT Removed "Translating mode" status message above edit form - should be clear by the language dropdown above the CMS tree now
------------------------------------------------------------------------
r70322 | ischommer | 2009-01-19 13:09:55 +1300 (Mon, 19 Jan 2009) | 1 line

BUGFIX Ensuring that new pages can't be created when in translation mode by disabling the "create..." tree action
------------------------------------------------------------------------
r70323 | ischommer | 2009-01-19 13:11:08 +1300 (Mon, 19 Jan 2009) | 1 line

BUGFIX Fixed expanded/unexpanded flags on new tree items - was showing expanded styling (plus icon) with newly created pages
------------------------------------------------------------------------
r70324 | ischommer | 2009-01-19 13:26:02 +1300 (Mon, 19 Jan 2009) | 1 line

BUGFIX Making sure that LeftAndMain->CurrentPage() respects language settings - was returning pages in different language from session after switching between languages in cms
------------------------------------------------------------------------
r71297 | sharvey | 2009-02-03 18:12:42 +1300 (Tue, 03 Feb 2009) | 1 line

BUGFIX Only show the LangSelector dropdown if there's multiple languages available on the site
------------------------------------------------------------------------
r73343 | ischommer | 2009-03-19 06:14:02 +1300 (Thu, 19 Mar 2009) | 1 line

BUGFIX Changed CSS selector for TranslationTab javascript behaviour to be less specific
------------------------------------------------------------------------
r73344 | ischommer | 2009-03-19 06:14:59 +1300 (Thu, 19 Mar 2009) | 1 line

BUGFIX Checking for existence of original before trying to get translation in LeftAndMain->currentPage()
------------------------------------------------------------------------
r73345 | ischommer | 2009-03-19 06:18:52 +1300 (Thu, 19 Mar 2009) | 3 lines

ENHANCEMENT Showing all available languages in language selector above sitetree in CMS - you can now create new pages in completely new languages without any relation to an "original"
ENHANCEMENT Added CMSMain->IsTranslatableEnabled
API CHANGE Removed CMSMain->switchlanguage() - createTranslation() is sufficient for new, ajax refreshing of CMS state got way too complicated for switching languages, we now just reload the entire CMS with a different ?lang GET parameter
------------------------------------------------------------------------
r73469 | ischommer | 2009-03-20 21:49:27 +1300 (Fri, 20 Mar 2009) | 1 line

ENHANCEMENT Adjusted CMSMain and LeftAndMain to use locales instead of short lang codes when reading and writing translations. See r73468 for details on the underlying Translatable datamodel change
------------------------------------------------------------------------
r74071 | ischommer | 2009-04-04 10:24:59 +1300 (Sat, 04 Apr 2009) | 1 line

BUGFIX Fixed Form_EditForm_Locale reference in LeftAndMain_right.js (used to be Form_EditForm_Lang)
------------------------------------------------------------------------
r74072 | ischommer | 2009-04-04 10:26:51 +1300 (Sat, 04 Apr 2009) | 1 line

MINOR Using Translatable::choose_site_locale() instead of choose_site_lang() in LeftAndMain->init()
------------------------------------------------------------------------
r74951 | ischommer | 2009-04-22 16:23:56 +1200 (Wed, 22 Apr 2009) | 1 line

BUGFIX Fixed CMSMainTest->testThatGetCMSFieldsWorksOnEveryPageType() - was comparing a string $class with instanceof() instead of comparing the actually created instance
------------------------------------------------------------------------



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74988 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:13 +13:00
Andrew O'Neil
699eda53be FEATURE: #3659 - Update key to show what purple means (ezero)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72804 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:07 +13:00
James Kirkus-Lamont
c17bc65432 BUGFIX: removed doubled up pipes and border on switch view links in footer.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:06 +13:00
James Kirkus-Lamont
0105f36866 BUGIX: CMS UI changed search spinner, hide search button while processing (better interaction feedback)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:05 +13:00
James Kirkus-Lamont
d8687d4063 BUGFIX: CMS UI site content > search > add criteria select element now returns back to prompt & tweaked layout
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70994 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:04 +13:00
Sean Harvey
1febd10096 MINOR Code formatting fix in SecurityAdmin_left.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:04 +13:00
Sean Harvey
0f6280c563 BUGFIX Fixed styling for "Delete selected files" in the left-hand tree actions for AssetAdmin. Thanks ajshort!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:01 +13:00
Will Rossiter
d6949c03d5 MINOR: ticket 1846. changed logout text to title case
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70596 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:01 +13:00
James Kirkus-Lamont
5f51bfe7d9 BUGFIX: cms ui fixing up treetool
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70583 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:00 +13:00
James Kirkus-Lamont
c1237db4b7 BUGFIX: cms ui fix styling of tools on files & images section
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70572 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:00 +13:00
James Kirkus-Lamont
dc0ee3e223 BUGFIX: cms ui fix styling of tools on files & images section
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70567 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:00 +13:00
James Kirkus-Lamont
3611ace323 BUGFIX: reverted previous tree tool change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70566 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:59 +13:00
James Kirkus-Lamont
406b507f0b BUGFIX: cms ui fix styling of tools on files & images section
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:59 +13:00
James Kirkus-Lamont
deb84a5c5a BUGFIX: cms ui tidying up tree tools
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:57 +13:00
James Kirkus-Lamont
75e92118fa BUGFIX: cms ui form site tree input alignments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:55 +13:00
James Kirkus-Lamont
c948a45176 cms ui: site tree tools visual update
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70303 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:55 +13:00
James Kirkus-Lamont
b7e2a51c64 cms ui fix: adding separator above allow drag and drop
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Sean Harvey
2abafb9382 ENHANCEMENT Allow specifying application URL for the top right logo instead of hardcoded silverstripe.com. Thanks hamish!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69734 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:51 +13:00
Ingo Schommer
89eec30d48 BUGFIX Added <td class="action"> to AssetTableField.ss to comply with template semantics of parent classes (necessary to detect javascript actions)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:49 +13:00
Sean Harvey
63f5421296 BUGFIX Turned english text into translatable entity for PageCommentInterface link for RSS feed of all comments for all pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68921 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:48 +13:00
Will Rossiter
a31edf294f MINOR: added link to all Comments feed in Page Comments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:48 +13:00
Ingo Schommer
3e4c5ce4e0 BUGFIX Fixed translation of CommentAdmin_SiteTree.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:47 +13:00
Brian Calhoun
709e352bbc Added ability for comment authors to leave a URL as a separate form field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
5b356e8617 BUGFIX Added $CurrentLink to templates of AssetTableField and MemberTableField in order to support auto-refreshing after popup-close (see #2925)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67526 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Ingo Schommer
e6178ad82b ENHANCEMENT Only showing import form in ModelAdmin if an importer is set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Sam Minnee
fc14227238 BUGFIX: Fixed warning on AssetAdmin (merged from trunk)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
d1ed61a5f4 MINOR Removed TaskList remnants of old cms workflow code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66642 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Normann Lou
9b7da1fbb3 APICHANGE:
1: make Contact Groups real hierarchical.
2: Cope the hierarchical contract type Groups with CRMAdmin, including:
- Search on these hierarchical groups.
- Column selection according to these these hierarchical groups
- Result entries render these hierarchical groups in a comma-seperated way including exported file.
- A single record groups showing/saving in CRMAdmin.
3: Add ability to forward a record to a specified email address in CRMAdmin.

Project specific feature:
1. Add note to each record in 1-many relation. Add the tab "Notes" for showing/editing/deleting notes of a record.


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:39 +13:00
Sean Harvey
4a60bb53d9 MINOR Removed old references to "rightbottom", which is now obsolete and caused a big box to appear in the CMS sometimes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:39 +13:00
Sean Harvey
5444d65fb2 MINOR Tidied up messy template syntax in LeftAndMain.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66373 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:39 +13:00
Sean Harvey
de5e015d7a ENHANCEMENT If there are no files in a folder in AssetAdmin, show a message
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66323 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:38 +13:00
Sean Harvey
77ea25ca07 MINOR Removed old workflow instances in the cms module. See ticket #3044
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66310 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:38 +13:00
Sam Minnee
45c4d670b6 API CHANGE: Revamped CMSMenu system to not instantiate any objects, so that _config.php doesn't get fskd
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:38 +13:00
Sean Harvey
c9bc8c41c7 BUGFIX Fixed draggable bug in AssetTableField - thanks for ajshort for the patch - ticket #3051
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Sam Minnee
18d735fca1 BUGFIX #3051 ajshort: Improved layout of assettablefield drag icon
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66079 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Ingo Schommer
ea6a60533a BUGFIX Fixed <% require %> call in ModelAdmin_left.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Sam Minnee
152ffc47d9 Include tabstrip js and css for modeladmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65971 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:36 +13:00
Sam Minnee
b13dc40ac1 Fixed dropdown-based ModelAdmin navigation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65861 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:35 +13:00