diff --git a/composer.json b/composer.json
index 075442b7d9a2e36b4a722c7198a867cdf2708946..381eff213f0a411dff7c0133ac2bda197ee876a8 100755
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,7 @@
"drupal/extlink": "~1",
"drupal/linkit": "~6.1.0",
"drupal/editor_advanced_link": "~2.2.0",
+ "drupal/ckeditor_media_embed": "~2",
"drupal/anchor_link": "~3",
"drupal/token": "~1",
"drupal/token_filter": "~2",
diff --git a/config/optional/editor.editor.basic_html.yml b/config/optional/editor.editor.basic_html.yml
index bc3f5fe068801e35c50aeb3ee4e3f5229996c852..83b6249d3d9a5f374aacdceb763c8de87a70ac07 100644
--- a/config/optional/editor.editor.basic_html.yml
+++ b/config/optional/editor.editor.basic_html.yml
@@ -39,40 +39,10 @@ settings:
- heading5
- heading6
ckeditor5_list:
- reversed: false
- startIndex: true
- ckeditor5_sourceEditing:
- allowed_tags:
- - '<cite>'
- - '<dd>'
- - '<dl>'
- - '<dt>'
- - '<span>'
- - '<img src alt height width data-*>'
- - '<drupal-entity data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button data-langcode alt title>'
- - '<a hreflang accesskey target>'
- - '<blockquote cite>'
- - '<h2 id>'
- - '<h3 id>'
- - '<h4 id>'
- - '<h5 id>'
- - '<h6 id>'
- - '<ol type>'
- - '<ul type>'
- - '<drupal-media title>'
- ckeditor_bidi_ckeditor5:
- rtl_default: false
- editor_advanced_link_link:
- enabled_attributes:
- - id
- - rel
- - target
- - title
- linkit_extension:
- linkit_enabled: true
- linkit_profile: linkit_all_nodes
- media_media:
- allow_view_mode_override: true
+ properties:
+ reversed: true
+ startIndex: true
+ multiBlock: true
ckeditor5_paste_filter_pasteFilter:
enabled: true
filters:
@@ -146,6 +116,21 @@ settings:
weight: 3
search: '<a name="OLE_LINK[^"]*">(.*?)<\/a>'
replace: $1
+ ckeditor5_sourceEditing:
+ allowed_tags: { }
+ ckeditor_bidi_ckeditor5:
+ rtl_default: false
+ editor_advanced_link_link:
+ enabled_attributes:
+ - id
+ - rel
+ - target
+ - title
+ linkit_extension:
+ linkit_enabled: true
+ linkit_profile: linkit_all_nodes
+ media_media:
+ allow_view_mode_override: true
image_upload:
status: true
scheme: public
diff --git a/config/optional/editor.editor.full_html.yml b/config/optional/editor.editor.full_html.yml
index 6798d9c638f811c914af4f730e078c9db8b64e65..e811c5244f05c09a16985434da32d5055638b9ec 100644
--- a/config/optional/editor.editor.full_html.yml
+++ b/config/optional/editor.editor.full_html.yml
@@ -14,6 +14,8 @@ settings:
- redo
- '|'
- drupalMedia
+ - MediaEmbed
+ - '|'
- blockQuote
- horizontalLine
- insertTable
@@ -106,6 +108,79 @@ settings:
reversed: true
startIndex: true
multiBlock: true
+ ckeditor5_paste_filter_pasteFilter:
+ enabled: true
+ filters:
+ -
+ enabled: true
+ weight: -10
+ search: '<o:p><\/o:p>'
+ replace: ''
+ -
+ enabled: true
+ weight: -9
+ search: '(<[^>]*) (style="[^"]*")'
+ replace: $1
+ -
+ enabled: true
+ weight: -8
+ search: '(<[^>]*) (face="[^"]*")'
+ replace: $1
+ -
+ enabled: true
+ weight: -7
+ search: '(<[^>]*) (class="[^"]*")'
+ replace: $1
+ -
+ enabled: true
+ weight: -6
+ search: '(<[^>]*) (valign="[^"]*")'
+ replace: $1
+ -
+ enabled: true
+ weight: -5
+ search: '<font[^>]*>'
+ replace: ''
+ -
+ enabled: true
+ weight: -4
+ search: '<\/font>'
+ replace: ''
+ -
+ enabled: true
+ weight: -3
+ search: '<span[^>]*>'
+ replace: ''
+ -
+ enabled: true
+ weight: -2
+ search: '<\/span>'
+ replace: ''
+ -
+ enabled: true
+ weight: -1
+ search: '<p> <\/p>'
+ replace: ''
+ -
+ enabled: true
+ weight: 0
+ search: '<p><\/p>'
+ replace: ''
+ -
+ enabled: true
+ weight: 1
+ search: '<b><\/b>'
+ replace: ''
+ -
+ enabled: true
+ weight: 2
+ search: '<i><\/i>'
+ replace: ''
+ -
+ enabled: true
+ weight: 3
+ search: '<a name="OLE_LINK[^"]*">(.*?)<\/a>'
+ replace: $1
ckeditor5_sourceEditing:
allowed_tags:
- '<div>'
@@ -197,79 +272,6 @@ settings:
linkit_profile: linkit_all_nodes
media_media:
allow_view_mode_override: true
- ckeditor5_paste_filter_pasteFilter:
- enabled: true
- filters:
- -
- enabled: true
- weight: -10
- search: '<o:p><\/o:p>'
- replace: ''
- -
- enabled: true
- weight: -9
- search: '(<[^>]*) (style="[^"]*")'
- replace: $1
- -
- enabled: true
- weight: -8
- search: '(<[^>]*) (face="[^"]*")'
- replace: $1
- -
- enabled: true
- weight: -7
- search: '(<[^>]*) (class="[^"]*")'
- replace: $1
- -
- enabled: true
- weight: -6
- search: '(<[^>]*) (valign="[^"]*")'
- replace: $1
- -
- enabled: true
- weight: -5
- search: '<font[^>]*>'
- replace: ''
- -
- enabled: true
- weight: -4
- search: '<\/font>'
- replace: ''
- -
- enabled: true
- weight: -3
- search: '<span[^>]*>'
- replace: ''
- -
- enabled: true
- weight: -2
- search: '<\/span>'
- replace: ''
- -
- enabled: true
- weight: -1
- search: '<p> <\/p>'
- replace: ''
- -
- enabled: true
- weight: 0
- search: '<p><\/p>'
- replace: ''
- -
- enabled: true
- weight: 1
- search: '<b><\/b>'
- replace: ''
- -
- enabled: true
- weight: 2
- search: '<i><\/i>'
- replace: ''
- -
- enabled: true
- weight: 3
- search: '<a name="OLE_LINK[^"]*">(.*?)<\/a>'
- replace: $1
image_upload:
status: true
scheme: public
diff --git a/config/optional/filter.format.basic_html.yml b/config/optional/filter.format.basic_html.yml
index 2ec7ea60f517139ea7ce605fff30431bcb3027aa..cfe1d7a86906c3586947b34c908fd91a24580b4c 100644
--- a/config/optional/filter.format.basic_html.yml
+++ b/config/optional/filter.format.basic_html.yml
@@ -19,110 +19,111 @@ name: 'Simple editor'
format: basic_html
weight: -9
filters:
- filter_html:
- id: filter_html
- provider: filter
- status: true
- weight: -50
+ ace_filter:
+ id: ace_filter
+ provider: ace_editor
+ status: false
+ weight: -38
settings:
- allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <cite> <dd> <dl> <dt> <span> <img src alt height width data-*> <drupal-entity data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button data-langcode alt title> <a hreflang accesskey target href title id rel data-entity-type data-entity-uuid data-entity-substitution> <blockquote cite> <ol type start> <ul type> <drupal-media title data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <strong> <em> <u> <code> <li>'
- filter_html_help: false
- filter_html_nofollow: false
- filter_align:
- id: filter_align
- provider: filter
- status: true
- weight: -47
- settings: { }
- filter_caption:
- id: filter_caption
- provider: filter
- status: true
- weight: -46
- settings: { }
+ theme: cobalt
+ syntax: html
+ height: 500px
+ width: 700px
+ font_size: 10pt
+ line_numbers: '1'
+ print_margins: '1'
+ show_invisibles: '0'
+ use_wrap_mode: '1'
+ blazy_filter:
+ id: blazy_filter
+ provider: blazy
+ status: false
+ weight: -35
+ settings:
+ media_switch: ''
+ hybrid_style: ''
+ box_style: ''
+ box_media_style: ''
+ box_caption: ''
+ filter_tags:
+ img: img
+ iframe: '0'
+ use_data_uri: '0'
editor_file_reference:
id: editor_file_reference
provider: editor
status: true
weight: -44
settings: { }
- filter_url:
- id: filter_url
- provider: filter
- status: true
- weight: -48
- settings:
- filter_url_length: 72
- filter_pathologic:
- id: filter_pathologic
- provider: pathologic
- status: true
- weight: -49
- settings:
- settings_source: global
- local_settings:
- protocol_style: full
- local_paths: ''
entity_embed:
id: entity_embed
provider: entity_embed
status: true
weight: -45
settings: { }
+ filter_align:
+ id: filter_align
+ provider: filter
+ status: true
+ weight: -47
+ settings: { }
filter_autop:
id: filter_autop
provider: filter
status: false
weight: -41
settings: { }
+ filter_caption:
+ id: filter_caption
+ provider: filter
+ status: true
+ weight: -46
+ settings: { }
+ filter_html:
+ id: filter_html
+ provider: filter
+ status: true
+ weight: -50
+ settings:
+ allowed_html: '<br> <p> <h2> <h3> <h4> <h5> <h6> <strong> <em> <u> <code> <blockquote> <a href title id target="_blank" rel data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol reversed start> <li> <drupal-media data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <drupal-entity alt title data-align data-caption data-entity-embed-display data-entity-embed-display-settings data-view-mode data-entity-uuid data-langcode data-embed-button="gallery media node" data-entity-type="media node">'
+ filter_html_help: false
+ filter_html_nofollow: false
filter_html_escape:
id: filter_html_escape
provider: filter
status: false
weight: -42
settings: { }
- filter_htmlcorrector:
- id: filter_htmlcorrector
- provider: filter
- status: false
- weight: -39
- settings: { }
filter_html_image_secure:
id: filter_html_image_secure
provider: filter
status: false
weight: -40
settings: { }
- ace_filter:
- id: ace_filter
- provider: ace_editor
+ filter_htmlcorrector:
+ id: filter_htmlcorrector
+ provider: filter
status: false
- weight: -38
+ weight: -39
+ settings: { }
+ filter_pathologic:
+ id: filter_pathologic
+ provider: pathologic
+ status: true
+ weight: -49
settings:
- theme: cobalt
- syntax: html
- height: 500px
- width: 700px
- font_size: 10pt
- line_numbers: '1'
- show_invisibles: '0'
- print_margins: '1'
- auto_complete: true
- use_wrap_mode: '1'
- blazy_filter:
- id: blazy_filter
- provider: blazy
+ settings_source: global
+ local_settings:
+ protocol_style: full
+ local_paths: ''
+ keep_language_prefix: true
+ filter_url:
+ id: filter_url
+ provider: filter
status: true
- weight: -35
+ weight: -48
settings:
- filter_tags:
- img: img
- iframe: '0'
- media_switch: ''
- box_style: ''
- hybrid_style: ''
- use_data_uri: '0'
- box_caption: ''
+ filter_url_length: 72
media_embed:
id: media_embed
provider: media
@@ -141,29 +142,32 @@ filters:
image: image
remote_video: remote_video
video: video
- token_filter:
- id: token_filter
- provider: token_filter
- status: false
- weight: 0
- settings:
- replace_empty: '0'
slick_filter:
id: slick_filter
provider: slick
status: false
weight: 4
settings:
+ caption:
+ alt: '0'
+ title: '0'
optionset: default
- media_switch: ''
layout: ''
- skin: ''
background: false
+ box_caption: ''
+ box_caption_custom: ''
+ box_media_style: ''
loading: ''
- preload: false
+ box_style: ''
image_style: ''
+ media_switch: ''
ratio: ''
thumbnail_style: ''
+ grid: ''
+ grid_medium: ''
+ grid_small: ''
+ style: ''
+ skin: ''
overridables:
arrows: '0'
autoplay: '0'
@@ -179,3 +183,12 @@ filters:
thumbnail_effect: ''
thumbnail_position: ''
override: false
+ preserve_keys: false
+ visible_items: null
+ token_filter:
+ id: token_filter
+ provider: token_filter
+ status: false
+ weight: 0
+ settings:
+ replace_empty: '0'
diff --git a/config/optional/filter.format.full_html.yml b/config/optional/filter.format.full_html.yml
index 7e699cb438c9f3d99643725404a8b35dd464ced4..9f39cb3d0dc753b8fe9a621bf0054c0410ec67e3 100644
--- a/config/optional/filter.format.full_html.yml
+++ b/config/optional/filter.format.full_html.yml
@@ -9,6 +9,7 @@ dependencies:
module:
- ace_editor
- blazy
+ - ckeditor_media_embed
- editor
- entity_embed
- linkit
@@ -20,29 +21,71 @@ name: 'Rich editor'
format: full_html
weight: -10
filters:
+ ace_filter:
+ id: ace_filter
+ provider: ace_editor
+ status: false
+ weight: -37
+ settings:
+ theme: cobalt
+ syntax: html
+ height: 500px
+ width: 700px
+ font_size: 10pt
+ line_numbers: '1'
+ print_margins: '1'
+ show_invisibles: '0'
+ use_wrap_mode: '1'
+ blazy_filter:
+ id: blazy_filter
+ provider: blazy
+ status: false
+ weight: -35
+ settings:
+ media_switch: ''
+ hybrid_style: ''
+ box_style: ''
+ box_media_style: ''
+ box_caption: ''
+ filter_tags:
+ img: img
+ iframe: '0'
+ use_data_uri: '0'
+ editor_file_reference:
+ id: editor_file_reference
+ provider: editor
+ status: true
+ weight: -43
+ settings: { }
+ entity_embed:
+ id: entity_embed
+ provider: entity_embed
+ status: true
+ weight: -48
+ settings: { }
filter_align:
id: filter_align
provider: filter
status: true
weight: -50
settings: { }
+ filter_autop:
+ id: filter_autop
+ provider: filter
+ status: false
+ weight: -39
+ settings: { }
filter_caption:
id: filter_caption
provider: filter
status: true
weight: -49
settings: { }
- filter_htmlcorrector:
- id: filter_htmlcorrector
- provider: filter
- status: true
- weight: -44
- settings: { }
- editor_file_reference:
- id: editor_file_reference
- provider: editor
+ filter_ckeditor_media_embed:
+ id: filter_ckeditor_media_embed
+ provider: ckeditor_media_embed
status: true
- weight: -43
+ weight: 0
settings: { }
filter_html:
id: filter_html
@@ -53,18 +96,11 @@ filters:
allowed_html: '<div class="bs-callout bs-callout-danger bs-callout-warning bs-callout-info well well-lg well-sm alert alert-success alert-info alert-warning alert-danger card bg-primary bg-success bg-info bg-warning bg-danger card-header card-title card-body card-footer"> <span> <h2 class="display-1 display-2"> <h3 class="display-3"> <h4 class="display-4">'
filter_html_help: true
filter_html_nofollow: false
- filter_url:
- id: filter_url
+ filter_html_escape:
+ id: filter_html_escape
provider: filter
- status: true
- weight: -45
- settings:
- filter_url_length: 72
- entity_embed:
- id: entity_embed
- provider: entity_embed
- status: true
- weight: -48
+ status: false
+ weight: -40
settings: { }
filter_html_image_secure:
id: filter_html_image_secure
@@ -72,17 +108,11 @@ filters:
status: false
weight: -38
settings: { }
- filter_autop:
- id: filter_autop
- provider: filter
- status: false
- weight: -39
- settings: { }
- filter_html_escape:
- id: filter_html_escape
+ filter_htmlcorrector:
+ id: filter_htmlcorrector
provider: filter
- status: false
- weight: -40
+ status: true
+ weight: -44
settings: { }
filter_pathologic:
id: filter_pathologic
@@ -94,35 +124,21 @@ filters:
local_settings:
protocol_style: full
local_paths: ''
- ace_filter:
- id: ace_filter
- provider: ace_editor
- status: false
- weight: -37
+ keep_language_prefix: true
+ filter_url:
+ id: filter_url
+ provider: filter
+ status: true
+ weight: -45
settings:
- theme: cobalt
- syntax: html
- height: 500px
- width: 700px
- font_size: 10pt
- line_numbers: '1'
- print_margins: '1'
- show_invisibles: '0'
- use_wrap_mode: '1'
- blazy_filter:
- id: blazy_filter
- provider: blazy
+ filter_url_length: 72
+ linkit:
+ id: linkit
+ provider: linkit
status: true
- weight: -35
+ weight: 0
settings:
- media_switch: ''
- hybrid_style: ''
- box_style: ''
- box_caption: ''
- filter_tags:
- img: img
- iframe: '0'
- use_data_uri: '0'
+ title: true
media_embed:
id: media_embed
provider: media
@@ -141,29 +157,32 @@ filters:
image: image
remote_video: remote_video
video: video
- token_filter:
- id: token_filter
- provider: token_filter
- status: false
- weight: 0
- settings:
- replace_empty: '0'
slick_filter:
id: slick_filter
provider: slick
status: false
weight: 4
settings:
+ caption:
+ alt: '0'
+ title: '0'
optionset: default
layout: ''
- skin: ''
background: false
+ box_caption: ''
+ box_caption_custom: ''
+ box_media_style: ''
loading: ''
- preload: false
+ box_style: ''
image_style: ''
media_switch: ''
ratio: ''
thumbnail_style: ''
+ grid: ''
+ grid_medium: ''
+ grid_small: ''
+ style: ''
+ skin: ''
overridables:
arrows: '0'
autoplay: '0'
@@ -179,10 +198,12 @@ filters:
thumbnail_effect: ''
thumbnail_position: ''
override: false
- linkit:
- id: linkit
- provider: linkit
- status: true
+ preserve_keys: false
+ visible_items: null
+ token_filter:
+ id: token_filter
+ provider: token_filter
+ status: false
weight: 0
settings:
- title: true
+ replace_empty: '0'
diff --git a/config/permissions/user.permissions.authenticated.yml b/config/permissions/user.permissions.authenticated.yml
index cd551fa949b85eb9d1eeb62ab1c580cbf4ef76ee..9798a13e943e68063621f00ab3303e4f65d1ea7a 100644
--- a/config/permissions/user.permissions.authenticated.yml
+++ b/config/permissions/user.permissions.authenticated.yml
@@ -1,3 +1,2 @@
id: authenticated
-permissions:
- - 'use text format basic_html'
+permissions: { }
diff --git a/config/permissions/user.permissions.content_admin.yml b/config/permissions/user.permissions.content_admin.yml
index 568ae497f7d4edc4abbd611aa53e7217596872a0..1848fe4142495c346280305b64648136084f41c9 100644
--- a/config/permissions/user.permissions.content_admin.yml
+++ b/config/permissions/user.permissions.content_admin.yml
@@ -1,3 +1,4 @@
id: content_admin
permissions:
+ - 'use text format basic_html'
- 'use text format full_html'
diff --git a/config/permissions/user.permissions.editor.yml b/config/permissions/user.permissions.editor.yml
index 1e1b5bfa75fb4bb2da175fdd41c9e52746bbd8ba..c9770aa4847e8144e013634dac08b1092d4bd9d3 100644
--- a/config/permissions/user.permissions.editor.yml
+++ b/config/permissions/user.permissions.editor.yml
@@ -1,3 +1,4 @@
id: editor
permissions:
+ - 'use text format basic_html'
- 'use text format full_html'
diff --git a/config/permissions/user.permissions.seo_admin.yml b/config/permissions/user.permissions.seo_admin.yml
index 23d2455ef362e59e9e1486b7f85b772e8e3dee57..955359445d491cd136cc8f1fa5492b8eaa9a1ca3 100644
--- a/config/permissions/user.permissions.seo_admin.yml
+++ b/config/permissions/user.permissions.seo_admin.yml
@@ -1,4 +1,5 @@
id: seo_admin
permissions:
- - 'use text format code_html'
+ - 'use text format basic_html'
- 'use text format full_html'
+ - 'use text format code_html'
diff --git a/config/permissions/user.permissions.site_admin.yml b/config/permissions/user.permissions.site_admin.yml
index fadc05072e6e6b07512f16ddb59e0d3253729397..afea4561fb7fa98ba0abe29aefd58c257420aac0 100644
--- a/config/permissions/user.permissions.site_admin.yml
+++ b/config/permissions/user.permissions.site_admin.yml
@@ -1,4 +1,5 @@
id: site_admin
permissions:
- - 'use text format code_html'
+ - 'use text format basic_html'
- 'use text format full_html'
+ - 'use text format code_html'
diff --git a/varbase_editor.info.yml b/varbase_editor.info.yml
index f8bda38cbc3027d3a65b6caf8592bfb3c1e36307..92859564e75ede06edbf8b240cb1540a5fc66509 100755
--- a/varbase_editor.info.yml
+++ b/varbase_editor.info.yml
@@ -19,6 +19,7 @@ install:
- slick
- extlink
- editor_advanced_link
+ - ckeditor_media_embed
- linkit
- pathologic
- token