Commit Graph

320 Commits

Author SHA1 Message Date
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
Sean Harvey
33ce4d8824 BUGFIX Fixed newly created Group records in SecurityAdmin not having "admin/security/show/" link by adding missing site tree handlers in SecurityAdmin_left.js
MINOR Reworked SecurityAdmin->SiteTreeAsUL() code to be tidier and easier to understand
BUGFIX Fixed ajax deletion of Group records properly - the site tree items didn't disappear immediately after deleting

MINOR Removed AssetAdmin->returnItemToUser() as it does the same thing as the parent class' LeftAndMain
MINOR Removed unused AssetAdmin_left.js and AssetAdmin_right.js Requirements calls in AssetAdmin - these files no longer exist



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:12 +13:00
Sam Minnee
f6386a4c47 BUGFIX: Explicitly destroy TinyMCE instances when loading a new page, in an attempt to reduce memory leaks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74924 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:12 +13:00
Hamish Friedlander
429749535b MINOR: Add disabled class to InlineFormAction, adjust Folder to use InlineFormAction rather than LiteralField for "Delete unused thumbnails" button.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:11 +13:00
Sean Harvey
d781e268e8 BUGFIX Fixed javascript error in CommentTableField.js where input elements were not being correctly picked up, due to the form HTML change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@74098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:11 +13:00
Sam Minnee
8666fa9491 BUGFIX: Fixed layout of cms rhs area buttons
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73594 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:10 +13:00
Sam Minnee
46a5b5e50e BUGFIX: Simple toolbar alteration to make toolbar fit at 1024x768
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:10 +13:00
Sam Minnee
d1c52def2f Fixed issue with ModelAdmin tab CSS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:09 +13:00
Sam Minnee
f18ace08b7 BUGFIX #3715: Removed spurious change detection in files and images section
BUGFIX: #3715: Show the changes message in a popup instead of a blank confirm box

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:08 +13:00
Andrew O'Neil
8701d47f5c BUGFIX: #3491 - Fix nonexistant plugin stopping tinymce from working in safari.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71872 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:06 +13:00
Normann Lou
1d074a7e7a ENHANCEMENT: delete button keep spinning when cancel a deletion operation from the confirm window.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:06 +13:00
Normann Lou
5328056fcd BUGFIX: CRM "select all" and "select none" doesn't work when the crm manages multiple models.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:06 +13:00
Ingo Schommer
aba093c176 MINOR Fixed tab-spacing in cms/upload js files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71292 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:05 +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
Sam Minnee
58278bd8f5 Include the media widget into the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:05 +13:00
Sam Minnee
623e10d301 BUGFIX #3429: Fixed CMS change detection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71024 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:04 +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
Ingo Schommer
b423bbe5e0 BUGFIX Disabled inline "create folder" and "upload" for anything but Flash Player 9 - versions below have general compatibily issues, versions above (Flash Player 10) have new security restrictions around file dialogues which require an SWFUpload upgrade (see #3023)
ENHANCEMENT Allowing setting of foldername in AssetAdmin->addfolder() to simplify the inline "create folder" logic (doesn't need to send of a fake ajax form-save from CMS into /admin/assets just to save the folder name) (see #3412)
ENHANCEMENT Removed BrowserDetect javascript library which was randomly placed in Security_login.js and just included in AssetAdmin. Reverted to regex-matching for simple browser detection for now
BUGFIX Fixed "cancel" button for inline "create folder" functionality (was not stopping event in IE7)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:04 +13:00
Andrew O'Neil
aba473608b BUGFIX: Fix incorrect URL when adding a new Member via the MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70750 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Will Rossiter
5759314893 BUGFIX: show flash icon and box if flash file exists. MINOR: created a default editor.css file which has base css styles for the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Sean Harvey
39b10d2923 MINOR Code formatting for delete unused thumbnails functionality
MINOR Use FormResponse instead of echoing strings as JS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:02 +13:00
Ingo Schommer
b686f45ab5 MINOR Removed hard-to-debug error trap in SecurityAdmin_right.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:02 +13:00
Will Rossiter
fe4e18bc0e MINOR: merged patch from keeny. Put comment data into Cookie and load if user fails maths spam question. Clear comment cookie on successful posting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:57 +13:00
Sean Harvey
229c036d59 BUGFIX If __form.elements.ID is not defined, don't cause an error in the CMS under certain circumstances
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70481 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:56 +13:00
Will Rossiter
e0e9acb8b9 BUGFIX: fixed size of popup on 1024x768 resolutions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70445 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:56 +13:00
Normann Lou
36bd0dea29 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70151 467b73ca-7a2a-4603-9d3b-597d59a354a9 2011-02-02 17:47:54 +13:00
James Kirkus-Lamont
cdfe7edab1 stopped null properties being added when images inserted in cms (hspace, vspace, align)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Sean Harvey
51881ac87a BUGFIX Strip out any "~" characters that may stop the staging link from working in IE6/IE7
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sean Harvey
aeeb7bbc7b BUGFIX Check for form object before calling observe() on the element. The CheckBoxRange constructor allows for a null form, so a check for a form object is essential.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70046 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sam Minnee
35f2bc0a2f BUGFIX #3024 - Stopped style dropdowns from getting stuck by making them regular dropdowns. Not as pretty but more stable.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Ingo Schommer
4cf2ee5e38 BUGFIX Explicitly setting "lang" as a GET var when getting a page within the CMS (if the language chooser DOM object is available, hence translation mode is enabled). Used in CMSMain->init() to set the "current language". (merged from branches/translatable in r64523, thanks wakeless!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:52 +13:00
Sam Minnee
c02d69037a BUGFIX #3199: No longer warned about saving changes if you have actually pressed save.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69720 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:51 +13:00
Sam Minnee
5a79ae34f6 BUGFIX #3097: Removed buggy template feature
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:51 +13:00
Ingo Schommer
85219a154d MINOR Added french translation (see #3290)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69591 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:50 +13:00
Ingo Schommer
f65e133389 BUGFIX Fixed SiteTreeHandlers.loadTree_url url concatenation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:50 +13:00
Sean Harvey
f4f02b7afc BUGFIX "console not defined" error in IE in en_US.js, check typeof(console) is not undefined before calling console.error()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:48 +13:00
Ingo Schommer
ccebbcf6ea MINOR fixed javascript initialization bug in SecurityAdmin_left.js (see #3211)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68531 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Andrew O'Neil
df217369da BUGFIX: #3174 - Unable to drop widgets into widget areas in CMS (marcink)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Sean Harvey
9baf35d500 ENHANCEMENT Added ability to include a blockquote in the CMS WYSIWYG editor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Sean Harvey
1c98c2e8e5 BUGFIX Scrollbars didn't appear properly in CMS without resizing the window manually, so used jQuery to properly detect when document is ready before attempting resize. Ticket #3089
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Sean Harvey
6fca21ecd0 BUGFIX Fixed error in javascript (because of commented out code) that broke IE6/7 in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Sam Minnee
170a0f256f #1885: Fixed safari bold, italic, underline by removing HTML scrubbing.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
43058e137c BUGFIX Fixed sortWidgets() function in WidgetAreaEditor not working because it was picking up comment nodes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sam Minnee
33c05c65f4 BUGFIX: ModelAdmin clear search now preserves the result column selection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Will Rossiter
4bba3151df MINOR: actually allow youtube / blip videos to be embedded into the cms content area
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66542 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
0b6fccd21e BUGFIX Removed dependency on ComplexTableField JS in LeftAndMain for "My Profile" popup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66319 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
Sean Harvey
be0ca474eb BUGFIX Fixed far too small height and width of "Profile" popup in CMS, popupHeight and popupWidth should be defaultPopupHeight and defaultPopupWidth instead according to the ComplexTableField prototype
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66309 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:38 +13:00
Sam Minnee
e4b2ebdc1e BUGFIX: Made Behaviour.apply calls more specific
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:38 +13:00