From acaaf4a237b5cfe573894e59cc5c8d77b1c9fed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 20 Oct 2018 22:47:27 -0400 Subject: [PATCH 01/47] Add Markdown plugin for CKEditor --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5769e18..0a7759c 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ "drupal/block_theme_sync": "^1.0@alpha", "drupal/search404": "^1.0", "drupal/coffee": "^1.0@beta", - "drupal/twigsuggest": "1.x-dev" + "drupal/twigsuggest": "1.x-dev", + "drupal/ckeditor_markdown": "^1.1" }, "repositories": { "drupal": { From 60c04d74abd39a66a03b90ee2e530b7fbfd10a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 20 Oct 2018 22:47:43 -0400 Subject: [PATCH 02/47] Update composer lock file with markdown plugin --- composer.lock | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index f98d5ff..2f648e1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bc5e04f7ae5c73bd21998541499be5cf", + "content-hash": "a4f1a059fb6277a0172c4848e95f5f9e", "packages": [ { "name": "asm89/stack-cors", @@ -2418,6 +2418,53 @@ "source": "http://cgit.drupalcode.org/bulma" } }, + { + "name": "drupal/ckeditor_markdown", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://git.drupal.org/project/ckeditor_markdown", + "reference": "8.x-1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/ckeditor_markdown-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "4f18becc108f28fd2f78298b958a9398da254a00" + }, + "require": { + "drupal/core": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.1", + "datestamp": "1539699781", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "JeroenT", + "homepage": "https://www.drupal.org/user/2228934" + } + ], + "description": "Enables Markdown Plugin for CKEditor.", + "homepage": "https://www.drupal.org/project/ckeditor_markdown", + "support": { + "source": "http://cgit.drupalcode.org/ckeditor_markdown" + } + }, { "name": "drupal/coffee", "version": "1.0.0-beta2", From 7f82e500607bf766f148cfe85bdd28fefe75feff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 20 Oct 2018 22:50:30 -0400 Subject: [PATCH 03/47] Enable CKEditor Markdown --- config/sync/core.extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 6449a4b..8f39682 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -11,6 +11,7 @@ module: block_visibility_groups: 0 breakpoint: 0 ckeditor: 0 + ckeditor_markdown: 0 coffee: 0 color: 0 comment: 0 From fbda169db710935416f06f3b031607949a7d3b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 20 Oct 2018 22:50:56 -0400 Subject: [PATCH 04/47] Commit config snapshot --- ....snapshot.config_sync.module.ckeditor_markdown.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.ckeditor_markdown.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.ckeditor_markdown.yml b/config/sync/config_snapshot.snapshot.config_sync.module.ckeditor_markdown.yml new file mode 100644 index 0000000..4db9ed4 --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.ckeditor_markdown.yml @@ -0,0 +1,11 @@ +uuid: 02d79f5a-2243-41a9-a523-0ad54ee77c98 +langcode: en +status: true +dependencies: + module: + - ckeditor_markdown +id: config_sync.module.ckeditor_markdown +snapshotSet: config_sync +extensionType: module +extensionName: ckeditor_markdown +items: { } From d063ceb1187843e7b98976e70a0f7079e947a3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 20 Oct 2018 22:52:28 -0400 Subject: [PATCH 05/47] Replace home page hero slide block with basic block --- ...home_page_hero.yml => block.block.about.yml} | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) rename config/sync/{block.block.agarica_home_page_hero.yml => block.block.about.yml} (55%) diff --git a/config/sync/block.block.agarica_home_page_hero.yml b/config/sync/block.block.about.yml similarity index 55% rename from config/sync/block.block.agarica_home_page_hero.yml rename to config/sync/block.block.about.yml index ecc88bf..3a5f645 100644 --- a/config/sync/block.block.agarica_home_page_hero.yml +++ b/config/sync/block.block.about.yml @@ -1,30 +1,25 @@ -uuid: ffdcfb41-83ee-49ab-bae1-22a87c4e7416 +uuid: 56357005-422b-4381-99ce-214c74d057b7 langcode: en status: true dependencies: config: - block_visibility_groups.block_visibility_group.home_page content: - - 'block_content:slide:9f7eec29-3c40-49f1-b7d9-18ff5c4eb32d' - enforced: - module: - - block_content + - 'block_content:basic:a6151a57-f4fb-4c22-9973-d5517c5cbdb7' module: - block_content - block_visibility_groups theme: - agarica -_core: - default_config_hash: 7LaudnAYBHZQGUVPqWOVEya4bd5pa1kdHDJn9SKEhcE -id: agarica_home_page_hero +id: about theme: agarica region: highlighted weight: 0 provider: null -plugin: 'block_content:9f7eec29-3c40-49f1-b7d9-18ff5c4eb32d' +plugin: 'block_content:a6151a57-f4fb-4c22-9973-d5517c5cbdb7' settings: - id: 'block_content:9f7eec29-3c40-49f1-b7d9-18ff5c4eb32d' - label: 'Home page hero' + id: 'block_content:a6151a57-f4fb-4c22-9973-d5517c5cbdb7' + label: About provider: block_content label_display: '0' status: true From 0419c65dc01376c923274207350c4f6fb4b2682e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 20 Oct 2018 23:24:18 -0400 Subject: [PATCH 06/47] Coffee for everyone --- config/sync/user.role.anonymous.yml | 1 + config/sync/user.role.authenticated.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/sync/user.role.anonymous.yml b/config/sync/user.role.anonymous.yml index 21354c1..6e54780 100644 --- a/config/sync/user.role.anonymous.yml +++ b/config/sync/user.role.anonymous.yml @@ -9,6 +9,7 @@ label: 'Anonymous user' weight: 0 is_admin: false permissions: + - 'access coffee' - 'access comments' - 'access content' - 'access site-wide contact form' diff --git a/config/sync/user.role.authenticated.yml b/config/sync/user.role.authenticated.yml index 9bdbc1c..49c0c16 100644 --- a/config/sync/user.role.authenticated.yml +++ b/config/sync/user.role.authenticated.yml @@ -9,6 +9,7 @@ label: 'Authenticated user' weight: 1 is_admin: false permissions: + - 'access coffee' - 'access comments' - 'access content' - 'access shortcuts' From e3f42b097765000a5efb77b62206721b8cabbb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 20 Oct 2018 23:32:40 -0400 Subject: [PATCH 07/47] Add markdown button to CKEditor menu bars --- config/sync/editor.editor.basic_html.yml | 7 +++++-- config/sync/editor.editor.full_html.yml | 7 +++++-- config/sync/filter.format.basic_html.yml | 2 +- config/sync/filter.format.full_html.yml | 9 +++++++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/config/sync/editor.editor.basic_html.yml b/config/sync/editor.editor.basic_html.yml index 3177ddb..ef625a7 100644 --- a/config/sync/editor.editor.basic_html.yml +++ b/config/sync/editor.editor.basic_html.yml @@ -17,6 +17,7 @@ settings: - name: Formatting items: + - Markdown - Bold - Italic - @@ -43,6 +44,8 @@ settings: items: - Source plugins: + language: + language_list: un stylescombo: styles: '' image_upload: @@ -51,5 +54,5 @@ image_upload: directory: inline-images max_size: '' max_dimensions: - width: 0 - height: 0 + width: null + height: null diff --git a/config/sync/editor.editor.full_html.yml b/config/sync/editor.editor.full_html.yml index c7f8970..7bfc1d9 100644 --- a/config/sync/editor.editor.full_html.yml +++ b/config/sync/editor.editor.full_html.yml @@ -17,6 +17,7 @@ settings: - name: Formatting items: + - Markdown - Bold - Italic - Strike @@ -51,6 +52,8 @@ settings: - ShowBlocks - Source plugins: + language: + language_list: un stylescombo: styles: '' image_upload: @@ -59,5 +62,5 @@ image_upload: directory: inline-images max_size: '' max_dimensions: - width: 0 - height: 0 + width: null + height: null diff --git a/config/sync/filter.format.basic_html.yml b/config/sync/filter.format.basic_html.yml index 8ca1fda..d3bcc86 100644 --- a/config/sync/filter.format.basic_html.yml +++ b/config/sync/filter.format.basic_html.yml @@ -16,7 +16,7 @@ filters: status: true weight: -10 settings: - allowed_html: '