Commit Graph

318 Commits

Author SHA1 Message Date
Sam Minnee
119121b0f2 BUGFIX Open selected node and immediate child nodes when using batch actions to ensure that all nodes can actually be selected. This will optionally trigger ajax loading for further nodes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81457 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 05:36:24 +00:00
Sam Minnee
085d2e2cb0 BUGFIX #4328: Fixed drag and drop of files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-05 21:18:35 +00:00
Sean Harvey
cabf044700 BUGFIX Fixed file search in ThumbnailStripField not working because of incorrect ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-01 23:34:39 +00:00
Sam Minnee
9bc3f5fe2a ENHANCEMENT: Added manual Filesystem::sync() button to improve load time of admin/assets area.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-01 22:28:06 +00:00
Sam Minnee
1dd80edb8a MINOR: Fixed newlines and set svn:eol-style to native
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79474 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 23:14:01 +00:00
Sean Harvey
d82ba048bf Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79439 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 11:50:02 +00:00
Sam Minnee
3f9fd08ceb BUGFIX #3560 ajshort: Hide the SiteTree access group selector when choosing "Inherit from parent page".
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79366 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 22:23:29 +00:00
Ingo Schommer
0b7572abd5 MINOR Removed javascript debug call in ModelAdmin.js
ENHANCEMENT Calling tinymce callbacks for destroying previous instances and triggering saves in ModelAdmin.js. No full support for TinyMCE in ModelAdmin yet though.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 05:54:22 +00:00
Sean Harvey
09128f09b2 BUGFIX Changed references from "Image" to "FolderImages"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 03:19:44 +00:00
Ingo Schommer
832410b625 BUGFIX Using language dropdown to determine locale for partial tree ajax loads, because we can't rely on a page with a hidden "Locale" field being loaded in the CMS. Fixed bug with wrong spelling of "locale" argument. (see #3995).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@78118 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-28 23:10:57 +00:00
Sam Minnee
31325beec6 BUGFIX: Removed spurious console.log() functions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77552 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 05:08:44 +00:00
Sean Harvey
7bef4158e8 API CHANGE Removed @deprecated 2.3 JS function ingize() from LeftAndMain.js: Please use ss.i18n instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:17:39 +00:00
Sean Harvey
c69994f98f Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77023 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 23:19:51 +00:00
Sean Harvey
b34dcd40b0 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-15 00:13:11 +00:00
Sean Harvey
8bc81cc794 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:15:11 +00:00
Sean Harvey
b360ad9cd7 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76857 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:11:18 +00:00
Sam Minnee
1a1229cd96 BUGFIX: Fixed tab layout for add form of model admin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 05:18:50 +00:00
Ingo Schommer
92f0fc8675 BUGFIX Limit "show deleted pages" in CMS tree to current language (see #3994)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76655 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 05:01:39 +00:00
Ingo Schommer
b270615c18 BUGFIX Made SideTabs and SideReports work with Translatable by explicitly passing a "locale" GET parameter (see #4014)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 04:49:25 +00:00
Ingo Schommer
b0bbadc665 BUGFIX Creating a translation of a new page in a new language fails - fixed by adding locale to /createtranslation ajax call (see #4021)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 02:28:18 +00:00
Ingo Schommer
d02a311824 BUGFIX Fix getsubtree command in CMS tree to work with Translatable (#3995)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 02:17:21 +00:00
Sean Harvey
182d1061a9 Merged from 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 06:37:45 +00:00
Sean Harvey
7dd4e4284c ENHANCEMENT Added loading indicator for the AJAX request "Show deleted pages" checkbox in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 06:22:00 +00:00
Sean Harvey
b1b07c5325 BUGFIX Fixed scenarios where the page is readonly and the expected ParentType elements don't exist causing a JS error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 05:53:22 +00:00
Sean Harvey
0edf8eb19b BUGFIX Fixed case where "NoWidgets" was trying to be called on editablesegment
MINOR Code formatting on WidgetAreaEditor.js to make it easier to read



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 02:54:59 +00:00
Sean Harvey
a9ea6549c3 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75905 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-04 01:27:35 +00:00
Sean Harvey
e77cfb1427 Reverted r69684
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-01 03:27:11 +00:00
Sean Harvey
4e4810bbb6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75780 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-30 22:47:28 +00:00
Sean Harvey
42a6692d79 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 01:44:28 +00:00
Sam Minnee
bd19bda3aa MINOR: Removed spurious orig file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75149 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-27 00:21:48 +00:00
Ingo Schommer
8e442176e7 BUGFIX Fixed Form_EditForm_Locale reference in LeftAndMain_right.js (used to be Form_EditForm_Lang)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@74071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-03 21:24:59 +00:00
Normann Lou
230a70c02a merge open/modules/cms/branches/2.3 changeset 73452
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-24 08:23:09 +00:00
Ingo Schommer
893df91e33 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
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-20 08:49:27 +00:00
Ingo Schommer
a2541c2949 BUGFIX Changed CSS selector for TranslationTab javascript behaviour to be less specific
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73343 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 17:14:02 +00:00
Ingo Schommer
a78ce1998e MINOR Removed console.debug() from LeftAndMain_right.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 10:51:34 +00:00
Ingo Schommer
9260326ee6 ENHANCEMENT Better feedback for validation errors in ModelAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73031 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-13 10:19:57 +00:00
Ingo Schommer
71c64c1968 ENHANCEMENT Using ajax for the add/create action in ModelAdmin
ENHANCEMENT Adding global ajax error handlers for ModelAdmin save/delete requests
MINOR Added $recordID parameter to ModelAdmin_RecordController so it can be instanciated manually (necessary for post-create actions in ModelAdmin)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72978 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-12 16:42:31 +00:00
Ingo Schommer
5b0cf968f0 ENHANCEMENT Showing statusMessages via LeftAndMain.js->statusMessage() double as long - they we're dissappearing in a fraction of a second for short strings like "Error"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-12 16:39:25 +00:00
Sam Minnee
61d312643e Merged from branches/2.2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-10 22:26:22 +00:00
Andrew O'Neil
fa76e64d48 Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-04 03:35:29 +00:00
Sean Harvey
31f530cb0f Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71279 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:56:56 +00:00
Sean Harvey
75f962b6e9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71277 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:52:06 +00:00
Sean Harvey
34a50e3de6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:46:15 +00:00
Sean Harvey
9d32dd4026 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:26:44 +00:00
Sean Harvey
3680bbea46 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:22:20 +00:00
Sean Harvey
3d4630a2c8 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71259 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 02:50:25 +00:00
Ingo Schommer
b319355c67 ENHANCEMENT Augmenting stage links in CMS with &lang URL parameter if Translatable is enabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 12:39:51 +00:00
Ingo Schommer
c8beba696c 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


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69959 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 12:15:30 +00:00
Ingo Schommer
300435fb13 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:36:30 +00:00
Ingo Schommer
7e09cc8a18 MINOR merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-07 23:01:47 +00:00