From 552e32dabbf7bc7ad4dd5f0cd5a8a5120f9f1e81 Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 10:22:54 +1100 Subject: [PATCH 01/18] Hill Range CKEditor Recipe --- .../config/packages/hillrange_ck_editor.yaml | 17 +++++++++++++++++ hillrange/ckeditor/0.1/manifest.json | 13 +++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml create mode 100644 hillrange/ckeditor/0.1/manifest.json diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml new file mode 100644 index 00000000..14bb2450 --- /dev/null +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -0,0 +1,17 @@ +hillrange_ck_editor: + default_config: hillrange + configs: + hillrange: + toolbar: [ + ['Styles','Format','Font','FontSize'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','Undo','Redo','-','Cut','Copy','Paste','PasteText','Find','Replace','-','Outdent','Indent','-','Print','-','Maximize'], + '/', + ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] + ] + uiColor: "ddcccc" +twig: + paths: + '%kernel.project_dir%/templates/bundles/HillrangeCKEditor': HillrangeCKEditor + '%kernel.project_dir%/vendor/hillrange/ckeditor/Resources/views': HillrangeCKEditor \ No newline at end of file diff --git a/hillrange/ckeditor/0.1/manifest.json b/hillrange/ckeditor/0.1/manifest.json new file mode 100644 index 00000000..b09092b4 --- /dev/null +++ b/hillrange/ckeditor/0.1/manifest.json @@ -0,0 +1,13 @@ +{ + "bundles": + "Hillrange\\CKEditor\\HillrangeCKEditorBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + }, + "composer-scripts": { + "ckeditor:install": "symfony-cmd", + "make cache-warmup": "script", + "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd" + } +} From fb1a887a3fb3c6d357f5a568594dec94f1cf96b2 Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 10:31:43 +1100 Subject: [PATCH 02/18] Hill Range CKEditor File Repair --- .../config/packages/hillrange_ck_editor.yaml | 17 +++++++++-------- hillrange/ckeditor/0.1/manifest.json | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index 14bb2450..249da8fa 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -3,15 +3,16 @@ hillrange_ck_editor: configs: hillrange: toolbar: [ - ['Styles','Format','Font','FontSize'], - '/', - ['Bold','Italic','Underline','StrikeThrough','-','Undo','Redo','-','Cut','Copy','Paste','PasteText','Find','Replace','-','Outdent','Indent','-','Print','-','Maximize'], - '/', - ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], - ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] - ] + ['Styles','Format','Font','FontSize'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','Undo','Redo','-','Cut','Copy','Paste','PasteText','Find','Replace','-','Outdent','Indent','-','Print','-','Maximize'], + '/', + ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] + ] uiColor: "ddcccc" twig: paths: '%kernel.project_dir%/templates/bundles/HillrangeCKEditor': HillrangeCKEditor - '%kernel.project_dir%/vendor/hillrange/ckeditor/Resources/views': HillrangeCKEditor \ No newline at end of file + '%kernel.project_dir%/vendor/hillrange/ckeditor/Resources/views': HillrangeCKEditor + \ No newline at end of file diff --git a/hillrange/ckeditor/0.1/manifest.json b/hillrange/ckeditor/0.1/manifest.json index b09092b4..d268220a 100644 --- a/hillrange/ckeditor/0.1/manifest.json +++ b/hillrange/ckeditor/0.1/manifest.json @@ -1,5 +1,5 @@ { - "bundles": + "bundles": { "Hillrange\\CKEditor\\HillrangeCKEditorBundle": ["all"] }, "copy-from-recipe": { From ac6bad151d07e8e47bfd370e53788335f695d2c6 Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 10:37:09 +1100 Subject: [PATCH 03/18] Hill Range CKEditor File Repair --- hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index 249da8fa..76a08620 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -15,4 +15,3 @@ twig: paths: '%kernel.project_dir%/templates/bundles/HillrangeCKEditor': HillrangeCKEditor '%kernel.project_dir%/vendor/hillrange/ckeditor/Resources/views': HillrangeCKEditor - \ No newline at end of file From a42dfff035cb07ebb19cce21a6e35e4bea470986 Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 11:25:43 +1100 Subject: [PATCH 04/18] remove App template path --- .../config/packages/hillrange_ck_editor.yaml | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index 76a08620..c7180440 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -2,16 +2,20 @@ hillrange_ck_editor: default_config: hillrange configs: hillrange: - toolbar: [ - ['Styles','Format','Font','FontSize'], - '/', - ['Bold','Italic','Underline','StrikeThrough','-','Undo','Redo','-','Cut','Copy','Paste','PasteText','Find','Replace','-','Outdent','Indent','-','Print','-','Maximize'], - '/', - ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], - ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] - ] + toolbar: + - ['Styles','Format','Font','FontSize'] + - '/' + - ['Bold','Italic','Underline','StrikeThrough','-','Undo','Redo','-','Cut','Copy','Paste','PasteText','Find','Replace','-','Outdent','Indent','-','Print','-','Maximize'] + - '/' + - ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'] + - ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] uiColor: "ddcccc" + simple_toolbar: + toolbar: + - ['Bold', 'Italic', 'Strike', 'Link'] + - ['BulletedList', 'NumberedList', '-', 'Outdent', 'Indent'] + - ['Copy', 'Paste', 'PasteFromWord', '-', 'Undo', 'Redo'] + - ['Source'] twig: paths: - '%kernel.project_dir%/templates/bundles/HillrangeCKEditor': HillrangeCKEditor '%kernel.project_dir%/vendor/hillrange/ckeditor/Resources/views': HillrangeCKEditor From 93ee4e9de8fb0b61ea0610f3d3d587aca21e113c Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 11:26:55 +1100 Subject: [PATCH 05/18] remove App template path --- hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index c7180440..06d538d9 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -18,4 +18,5 @@ hillrange_ck_editor: - ['Source'] twig: paths: +# '%kernel.project_dir%/templates/bundles/HillrangeCKEditor': HillrangeCKEditor '%kernel.project_dir%/vendor/hillrange/ckeditor/Resources/views': HillrangeCKEditor From 46a6dafd076cdb8c19923764923694d8f95fc867 Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 11:31:19 +1100 Subject: [PATCH 06/18] Remove make cache:warmup --- hillrange/ckeditor/0.1/manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/hillrange/ckeditor/0.1/manifest.json b/hillrange/ckeditor/0.1/manifest.json index d268220a..18aca75c 100644 --- a/hillrange/ckeditor/0.1/manifest.json +++ b/hillrange/ckeditor/0.1/manifest.json @@ -7,7 +7,6 @@ }, "composer-scripts": { "ckeditor:install": "symfony-cmd", - "make cache-warmup": "script", "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd" } } From e44efff074d9769ffb304d10431983b51e21ef10 Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 12:16:44 +1100 Subject: [PATCH 07/18] Normal Toolbar --- .../ckeditor/0.1/config/packages/hillrange_ck_editor.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index 06d538d9..c12f3eff 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -1,7 +1,7 @@ hillrange_ck_editor: - default_config: hillrange + default_config: normal configs: - hillrange: + normal: toolbar: - ['Styles','Format','Font','FontSize'] - '/' From c0e7969da70c257e1c7b0313025f8a04a98ae35c Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 21:28:14 +1100 Subject: [PATCH 08/18] Remove twig config --- .../ckeditor/0.1/config/packages/hillrange_ck_editor.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index c12f3eff..baacd03d 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -16,7 +16,3 @@ hillrange_ck_editor: - ['BulletedList', 'NumberedList', '-', 'Outdent', 'Indent'] - ['Copy', 'Paste', 'PasteFromWord', '-', 'Undo', 'Redo'] - ['Source'] -twig: - paths: -# '%kernel.project_dir%/templates/bundles/HillrangeCKEditor': HillrangeCKEditor - '%kernel.project_dir%/vendor/hillrange/ckeditor/Resources/views': HillrangeCKEditor From 60e0f1d3ee7bbbf9634311a48f52c87d4bd1fcaa Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 21:49:42 +1100 Subject: [PATCH 09/18] Add space for retest --- hillrange/ckeditor/0.1/manifest.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hillrange/ckeditor/0.1/manifest.json b/hillrange/ckeditor/0.1/manifest.json index 18aca75c..ecb3d7c1 100644 --- a/hillrange/ckeditor/0.1/manifest.json +++ b/hillrange/ckeditor/0.1/manifest.json @@ -5,7 +5,9 @@ "copy-from-recipe": { "config/": "%CONFIG_DIR%/" }, + "composer-scripts": { + "cache:clear": "symfony-cmd", "ckeditor:install": "symfony-cmd", "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd" } From d613bf0bdc8b349a1787e0784efe224a66d1c810 Mon Sep 17 00:00:00 2001 From: craigray Date: Wed, 7 Feb 2018 22:01:39 +1100 Subject: [PATCH 10/18] Remove space for retest --- hillrange/ckeditor/0.1/manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/hillrange/ckeditor/0.1/manifest.json b/hillrange/ckeditor/0.1/manifest.json index ecb3d7c1..f7f37936 100644 --- a/hillrange/ckeditor/0.1/manifest.json +++ b/hillrange/ckeditor/0.1/manifest.json @@ -5,7 +5,6 @@ "copy-from-recipe": { "config/": "%CONFIG_DIR%/" }, - "composer-scripts": { "cache:clear": "symfony-cmd", "ckeditor:install": "symfony-cmd", From 6bbacca27df1dd6d114ecf9e98352a8a8d4869b0 Mon Sep 17 00:00:00 2001 From: craigray Date: Thu, 8 Feb 2018 15:06:21 +1100 Subject: [PATCH 11/18] Change in bundle --- hillrange/ckeditor/0.1/change.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hillrange/ckeditor/0.1/change.txt diff --git a/hillrange/ckeditor/0.1/change.txt b/hillrange/ckeditor/0.1/change.txt new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/hillrange/ckeditor/0.1/change.txt @@ -0,0 +1 @@ +1 From c6b5c487666d85f9ee0d25560328ab0fe1b6eb6c Mon Sep 17 00:00:00 2001 From: craigray Date: Thu, 8 Feb 2018 15:08:24 +1100 Subject: [PATCH 12/18] Change in bundle --- hillrange/ckeditor/0.1/change.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 hillrange/ckeditor/0.1/change.txt diff --git a/hillrange/ckeditor/0.1/change.txt b/hillrange/ckeditor/0.1/change.txt deleted file mode 100644 index d00491fd..00000000 --- a/hillrange/ckeditor/0.1/change.txt +++ /dev/null @@ -1 +0,0 @@ -1 From 02ce2462108caab4fce9faa14cb68b996dace97c Mon Sep 17 00:00:00 2001 From: craigray Date: Mon, 26 Feb 2018 09:51:45 +1100 Subject: [PATCH 13/18] Changes requested by Tobias fro Flex Recipe --- hillrange/ckeditor/0.1/manifest.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/hillrange/ckeditor/0.1/manifest.json b/hillrange/ckeditor/0.1/manifest.json index f7f37936..5a0af06c 100644 --- a/hillrange/ckeditor/0.1/manifest.json +++ b/hillrange/ckeditor/0.1/manifest.json @@ -6,8 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "composer-scripts": { - "cache:clear": "symfony-cmd", "ckeditor:install": "symfony-cmd", - "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd" } } From 779e57511b8f13ae63bdf81a58891450ea116f15 Mon Sep 17 00:00:00 2001 From: craigray Date: Mon, 26 Feb 2018 10:11:51 +1100 Subject: [PATCH 14/18] Changes requested by Tobias for Flex Recipe --- hillrange/ckeditor/0.1/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hillrange/ckeditor/0.1/manifest.json b/hillrange/ckeditor/0.1/manifest.json index 5a0af06c..2104ec72 100644 --- a/hillrange/ckeditor/0.1/manifest.json +++ b/hillrange/ckeditor/0.1/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "composer-scripts": { - "ckeditor:install": "symfony-cmd", + "ckeditor:install": "symfony-cmd" } } From 6af293becbba21e5e7277abd5436e7708793bf68 Mon Sep 17 00:00:00 2001 From: craigray Date: Mon, 26 Feb 2018 13:59:32 +1100 Subject: [PATCH 15/18] Retest --- hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index baacd03d..b0354885 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -10,6 +10,7 @@ hillrange_ck_editor: - ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'] - ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] uiColor: "ddcccc" + removeMe: ggg simple_toolbar: toolbar: - ['Bold', 'Italic', 'Strike', 'Link'] From de20338643f3671bd892b3e3772900c072ec1b49 Mon Sep 17 00:00:00 2001 From: craigray Date: Mon, 26 Feb 2018 14:03:55 +1100 Subject: [PATCH 16/18] Retest --- hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index b0354885..baacd03d 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -10,7 +10,6 @@ hillrange_ck_editor: - ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'] - ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] uiColor: "ddcccc" - removeMe: ggg simple_toolbar: toolbar: - ['Bold', 'Italic', 'Strike', 'Link'] From f1a5cd6aaed2afb36061c7dd8a5e42876de321aa Mon Sep 17 00:00:00 2001 From: craigray Date: Mon, 26 Feb 2018 14:06:24 +1100 Subject: [PATCH 17/18] Retest --- hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index baacd03d..e8ad3301 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -10,6 +10,7 @@ hillrange_ck_editor: - ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'] - ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] uiColor: "ddcccc" + removeMe: llll simple_toolbar: toolbar: - ['Bold', 'Italic', 'Strike', 'Link'] From 5653732ee7f64fc08d40cad4dd1aeb55fc4466f6 Mon Sep 17 00:00:00 2001 From: craigray Date: Mon, 26 Feb 2018 14:06:44 +1100 Subject: [PATCH 18/18] Retest --- hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml index e8ad3301..baacd03d 100644 --- a/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml +++ b/hillrange/ckeditor/0.1/config/packages/hillrange_ck_editor.yaml @@ -10,7 +10,6 @@ hillrange_ck_editor: - ['NumberedList','BulletedList','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'] - ['Image','Table','-','Link','Flash','Smiley','TextColor','BGColor','Source'] uiColor: "ddcccc" - removeMe: llll simple_toolbar: toolbar: - ['Bold', 'Italic', 'Strike', 'Link']