Commit Graph

125 Commits

Author SHA1 Message Date
Shannon Deminick
df3dc32de6 Block Editor List (#8273)
* add style to create-option in itempicker + removing overflow hidden

* style adjustment

* clean up of html

* correct sentence to use the number 7

* correct overlays, so they can use size

* numberrange prevalue editor

* add confirmRemove overlay

* correcting primary btn colors

* move confirmMessage below content of overlay.

* min max validation for numberrange

* remove comment

* improved actions for block list

* use file tree for view picker

* style adjustment to border of creator item in item-picker

* vertical align

* clean up + validation limit range

* rename ElementTypes to Blocks

* implement block list editor

* renaming

* use Chrome Headless for unit tests

* test for blockEditorService

* safer code

* block list editor

* rename view to overlayView

* block editor work

* Revert "rename view to overlayView"

This reverts commit 5b910c178a.

* block editor implementation

* sync models

* block list editor copy paste feature

* order var declarations

* remove unused paste function

* block list editor better naming

* simpler label generation

* clean up

* compile config for test mode

* Chrome Debug for VS code

* promise test working

* space change

* another two tests

* more tests for block list editor

* provide key on blockModel for angularJS performance optimization

* syncronization from infinite editing layers

* use an isolated scope

* more tests

* fix C# test

* remove unused block watcher component

* clean css

* only show on hover or focus for block-actions

* clean up and prepare for implementing settings

* remove console

* Add ability to render block list editor using Grid style rendering extension

* Enable Block List Editor settings editing

* Add Stacked Content to Block List migration

* Block Editor: Clean-up, refactoring, one step closer being ready for Content-Apps

* changes naming to Submit, to avoid misunderstanding.

* use a common variable on the block model for isOpen, to be able to make Actions show when open.

* NotSupported property editor, to be used when an editor is not supported in the given context.

* remove unused controller

* Hide group header if only one group is presented

* rename notsupport property editor css class

* smaller header for property group

* hide description if no description is presented

* css adjustments

* Inline create button styling: Better spacing, darker blue color for Focus Outline, moving the plus icon to mouse position for better visual appearance.

* css correction

* Add references for picked items

* Revert commit 45e892f350 - Changes api to GetData

* Use the .Data propertry as opposed to GetData in this PartialView

* Fix block list test failures

* Just parsing layout as model for partial views.

* minor adjustments

* Remove DB migrations so that they can be reviewed as a block

* Add migrations for new block editor

* Update default rendering partial view

* Add error handling to default template

* Handle color picker data in stacked content

* BlockList PreValue Editor opens configurations as overlay

* translation for prevalue editor property group headlines

* blockcard corrections

* block list prevalue corrections

* revert agressive clean up

* Block Picker

* MaxPropertyWidth PreValue + Implementation

* Incorporate latest block list editor changes, update migration for changed configuration

* Change declared converter type

* Handle invalid data type references

* Remove code duplicated from PR #7957

* use ElementModel for the ContentModel of an ElementType. So we can use ElementTypeModel for the ModelDefinition aka. the Type.

* do still show itempicker for BlockConfiguration even though there is no ElementTypes to pick. This enables the option to create a new ElementType to be used.

* use the right wrapper, for correct spacing

* parse item

* correct fallback for label

* removed unused callback

* paste feature for block-picker

* localize block-picker tabs

* Slightly change for shadow on block-picker item hover

* Localization of BlockEditor Settings Tab

* localizationService

* only filter when more than 8 items available

* Add multiple blocks if hold down CTRL or SuperKey

* adds notes

* ability to add a scoped stylesheet for block view

* make scoped block draggable + style adjustments

* provide index for custom view

* rename contentModel to data + rename layoutModel to layout

* clean up

* more localization

* openSettings option for block editor

* minor changes for a better developer experience

* paste mistake corrected

* only manipulate content-content-app if its present

* make small overlays slightly bigger

* moved block list entry editor into block list editor folder

* limit labelinterpretator to only runs ones pr. edit. and lets make sure to have a label thought we dont have any properties.

* fixed inline views gulp watcher

* changed vm to a better controller instance name

* make watch for views work again.

* able to re run watch

* make js up to date

* fix white background of image-picker

* media-picker container class

* loading indication

* adjust unit tests to latest interface

* getting started on JS Docs

* converting code to use contentTypeKey instead of contentTypeAlias, still missing a few TODOs.

* revert change

* add todo

* use Guid for Key

* use key

* Updates the caching layer to handle GUID keys for content types while preserving backwards compat, fixes unit tests, removes the strongly typed lists for the block editor value since it's unecessary

* Reverts the nested content changes, fixes up the GetEmptyByKey

* Returns ContentTypeKey from the server, updates js to use this everywhere and fix all js tests.

* Allows key in SimpleContentType

* correct for the new spelling

* appended this. since the method is a non-static class method.

* only add background-image if value isnt null

* simplifyed limits validation

* clean up

* no need to execute a digest.

* define the full model for new configurations

* removed setDataFromBlockModel and general clean up and added documentation

* default size should be medium

* use retriveValuesFrom method to transfer data.

* ability to disable an navigation item

* createElementTypeAndCallback working again for settings.

* still have the ability to retrive a scaffold model by alias, since we are still using alias in clipboard service.

* disable clipboard tab if no available paste options

* ups, should stay as alias

* disable clipboard when empty

* use property alias for content add button

* use a grey that can be seen on top of grey and on top of white.

* some accessibility improvements

* rename entry to block

* appended ' and added space in Element Type

* use background color for hover to corospond with active state

* make nested content unsupported

* Moving BlockEditorModelObject into its own file for Documentation purpose. Same goes for renaming BlockModel to BlockObject. and a lot of documentation written.

* fix links in js docs

* added a blocklistentryeditor for unsupported blocks

* ability to retrive the $scope from UmbVariantContentEditors, needed for Block Editor to get a scope existing across variants and splitview.

* Appending the block objects to layout, to share it across variants and in split-view.

* removed trailing comma

* Unsupported block

* Dont copy unsupported blocks

* use grey color for unsupported block

* text correction

* we dont have this fallback anymore

* sort properties

* Text change

* css correction

* use active to determine if an inline editor is expanded. To enable the inline editor to be expanded on creation.

* using udi instead of key.

* bringing the runtime block key back

* live editing ability

* live editing for settings data

* call formSubmit before property editor are removed from DOM. Both for overlay-editing and inline-editing. Fire an postFormSubmitting event after formSubmitting event to let editors know that data could have been updated.

* make sure settings object exists

* only set active to false if it was false before opening the editor.

* update test with new scope parameter

* move destroy responsibility to blockObject

* rename onDestroy to destroy

* added some JS-Docs

* correction jsDocs

* Update ElementType Resource to not use hardcoded URL but to use the Umbraco.Sys.ServerVariables.umbracoUrls instead

* Remove partially completed ConvertToElement migration, fixed in issue 7939 instead.

* Remove external property editor migration

* corrected naming of umbBlockListScopedBlock and umbBlockListBlock

* correct ngdoc type

* removed vscode specific configuration of karma

* Finished Todo, gets name of documentType if copying all entities in an infinite editor

* changed comment from TODO to something that explains the state.

* stop tracking build output files.

* rename files to match file name conventions

* this should not happen.

* remove dublicated code

* rename requestCopyBlock to copyBlock

* make sure images does not repeat.

* scale thumbnail for block showcase

* renamed blockcard.component to umb-block-card and moved it.

* removed inline style

* correct style location

* corrected filepath

* corrected file path

* keep elementTypes up to date through the EventService.

* mark Umbraco.BlockList as unsupported inside Nested Content

* correct js docs name

* remove comment

* remove comment

* remove unused controller

* rename inline method name

* corrected spelling mistake

* remove not very used vars

* make binding one-way

* split in multiple lines

* corrected default rendering

* removing documentation that is relevant for developers of new block editors. this documentation will be transfered to Our documentation.

* added danish translation

* corrected blog to blok

* Remove invalid using statement

* use native forEach

Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
Co-authored-by: Benjamin Carleski <benjamin@proworks.com>
Co-authored-by: Warren Buckley <warren@umbraco.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
Co-authored-by: Claus <claus@claus.nu>
2020-06-30 10:52:42 +01:00
Benjamin Carleski
a7ff20de6e Introduce Image URL Generator abstraction 2020-02-07 15:01:03 -08:00
Shannon
9303a49732 Moves the copy/paste rte stuff to a separate service, injects lazy property editors and relation service into the base content repositories 2019-10-23 19:08:03 +11:00
Shannon
17fd09fe3d Naming 2019-10-23 14:55:18 +11:00
Shannon
832803a9f6 fix build 2019-10-23 14:35:43 +11:00
Shannon
1adf5a30f3 Renames some stuff, updates RTE editor to return media/content refs and adds tests for locallink parsing 2019-10-22 15:48:47 +11:00
Shannon
4f9e0fcb92 No more using TemplateUtilities 2019-10-21 23:53:14 +11:00
Warren Buckley
ba319609f2 Fix up tests - thanks again VS for not notifying me that the Build fails when I build the entire SLN 2019-09-12 09:40:21 +01:00
Warren Buckley
cfe196a45d Fix up C# unit tests - VS19 failed to tell me about these failing to build :S 2019-09-10 11:47:52 +01:00
Stephan
14a056f4f4 Fix and cleanup 2019-06-07 11:15:58 +02:00
Stephan
55d4457c70 UmbracoContext: don't use obsolete properties 2019-04-23 08:29:43 +02:00
Stephan
2270188668 Refactor IPublishedContent.Children() 2019-04-23 08:28:23 +02:00
Stephan
f039b00a44 Introduce IPublishedPropertyType 2019-04-23 08:27:48 +02:00
Stephan
34ad8dfb8d Introduce IPublishedContentType 2019-04-23 08:27:40 +02:00
Bjarke Berg
e4c6ef05a9 Introduced both Siblings and SiblingsAndSelf 2019-03-19 14:59:52 +01:00
Stephan
d4664fbae6 Merge branch 'temp8' into temp8-3668-query-builder-snippits 2019-01-21 10:50:40 +01:00
Stephan
5aba1a6bd2 IAppPolicedCache is IAppPolicyCache 2019-01-18 07:56:38 +01:00
Bjarke Berg
ae3c8fe08c 3908 - removed tests for legacy up and down methods 2019-01-17 14:09:17 +01:00
Stephan
0bee01e0ee Great AppCaches renaming 2019-01-17 11:01:23 +01:00
Stephan
d4edbc8e79 Fix tests 2019-01-15 19:38:52 +01:00
Bjarke Berg
11ffafacdf Revert "Revert "Identify element types""
This reverts commit ff6a9ba9
2019-01-15 15:12:59 +01:00
Stephan
c6891c6c70 RegisterUnique 2018-11-29 10:35:16 +01:00
Stephan
f9a19ada04 IContainer.die.die.die 2018-11-28 12:59:40 +01:00
Stephan
49a0b68b28 IContainer is IRegister+IFactory 2018-11-28 11:05:41 +01:00
Stephan
66d931490e Merge branch temp8 into temp8-di2690 2018-10-08 19:22:20 +02:00
Stephan
e44ed00c97 Another fallback iteration 2018-10-03 10:31:35 +02:00
Stephan
0928fc099d Merge branch temp8 into temp8-11502 2018-07-31 15:34:42 +02:00
Stephan
2c66cdc102 Merge branch temp8 into temp8-di2690 2018-07-31 14:50:01 +02:00
Shannon
a83ea47c25 Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/Constants-Conventions.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Core/Models/Rdbms/LanguageDto.cs
#	src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
#	src/Umbraco.Core/PropertyEditors/PreValueField.cs
#	src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
#	src/Umbraco.Core/Services/FileService.cs
#	src/Umbraco.Core/Services/IFileService.cs
#	src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/less/variables.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
#	src/Umbraco.Web.UI.Client/src/views/media/move.html
#	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
#	src/Umbraco.Web.UI/Views/Web.config
#	src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
#	src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/umbraco.MacroEngines/Resources/Web.config
#	src/umbraco.cms/Actions/ActionRestore.cs
#	src/umbraco.editorControls/yesno/YesNoDataType.cs
2018-07-30 21:31:35 +10:00
Stephan
a35f67ecef Refactoring 2018-07-24 15:04:30 +02:00
Stephan
053698baf6 Merge branch andyb/u4-11502 into temp8-11502 2018-07-23 15:12:52 +02:00
AndyButland
1be74589f2 Combined fallback parameters into an array that defines methods and priority to be used. 2018-07-21 15:58:49 +02:00
Stephan
5836cd05cb Abstract container (in progress) 2018-07-20 15:45:01 +02:00
leekelleher
2da5a522b0 Updated PublishedContent unit-test
to support the fix in commit 7a9a4a2fab

However this meant that I had to update a bunch of other unit-tests, due to hardcoded counts/references on the content XML.
2018-07-18 10:56:31 +01:00
Stephan
b5dc538905 Merge branch 'u4-11502' of https://github.com/AndyButland/Umbraco-CMS into temp8-11502 2018-07-18 11:13:22 +02:00
Shannon
390514cd9d Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeUserManager.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/FileService.cs
#	src/Umbraco.Core/Services/IFileService.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
#	src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
#	src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/routes.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/config/splashes/noNodes.aspx
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/MemberTypeController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Routing/PublishedContentRequest.cs
#	src/Umbraco.Web/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
2018-07-18 13:19:14 +10:00
Sebastiaan Janssen
ca993187b0 Fixes unit tests after adding an extra node in the cache 2018-07-14 17:37:14 +02:00
Sebastiaan Janssen
861b2c61a8 Adds a few more test cases 2018-07-14 17:16:59 +02:00
Sebastiaan Janssen
9daae665e4 Adds unit tests for IsAncestor(OrSelf) and IsDescendant(OrSelf) 2018-07-14 17:09:02 +02:00
Shannon
41407d27d0 hopefully the last merge 2018-07-12 22:39:30 +10:00
AndyButland
aadd843c33 Implemented published value fall back via language 2018-07-08 16:14:58 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Sebastiaan Janssen
31965358c3 Removes unused class 2018-06-28 20:14:27 +02:00
Dan Booth
f083a33d92 U4 10778 - FirstChild<T> extension returns IPublishedContent rather than model of type T (#2623) 2018-06-28 20:09:54 +02:00
Stephan
d56af5872d Implement basic fallback plumbing (in progress) 2018-05-02 13:38:45 +02:00
Stephan
038fc87a40 Cleanup, fix tests 2018-04-30 15:11:01 +02:00
Stephan
ce8775b3e7 Cleanup IPublishedContent 2018-04-30 09:14:13 +02:00
Stephan
a69019aea0 From int languageId to string culture 2018-04-21 09:57:28 +02:00
Stephan
39cc7add80 Rename Umbraco.Whatever2 editors 2018-03-19 18:39:34 +01:00
Stephan
c0439b3c4e DataTypes refactoring - troubleshooting 2018-02-08 16:08:52 +01:00