From bac19fb2dfa40935d1ad5a34ccb21acaa86df792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarek=20Krupi=C5=84ski?= Date: Mon, 30 May 2022 11:45:32 +0200 Subject: [PATCH 1/6] #88575 - Move ACM modile files to blackbird --- .../layout/CONTENT_LIST_VIEW_blog.xml | 46 +++++++ .../layout/CONTENT_TYPE_VIEW_articles.xml | 46 +++++++ .../layout/catalogsearch_result_index.xml | 13 ++ .../layout/cms_index_index.xml | 130 ++++++++++++++++++ .../layout/contentmanager_index_content.xml | 10 ++ .../contentmanager_index_contentlist.xml | 10 ++ .../content/view/articles/list.phtml | 0 .../content/view/articles/view.phtml | 0 .../templates/content/view/sliders/list.phtml | 0 .../content/widget/sliders/list.phtml | 0 10 files changed, 255 insertions(+) create mode 100755 Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml create mode 100755 Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml create mode 100644 Blackbird_ContentManager/layout/catalogsearch_result_index.xml create mode 100644 Blackbird_ContentManager/layout/cms_index_index.xml create mode 100755 Blackbird_ContentManager/layout/contentmanager_index_content.xml create mode 100755 Blackbird_ContentManager/layout/contentmanager_index_contentlist.xml rename {Snowdog_Acm => Blackbird_ContentManager}/templates/content/view/articles/list.phtml (100%) rename {Snowdog_Acm => Blackbird_ContentManager}/templates/content/view/articles/view.phtml (100%) rename {Snowdog_Acm => Blackbird_ContentManager}/templates/content/view/sliders/list.phtml (100%) rename {Snowdog_Acm => Blackbird_ContentManager}/templates/content/widget/sliders/list.phtml (100%) diff --git a/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml b/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml new file mode 100755 index 000000000..3cdb1ea3a --- /dev/null +++ b/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml @@ -0,0 +1,46 @@ + + + + + + + + + cb_article_category + + + + articles + + + + + articles + + + cb_article_date + + + DESC + + + 6 + + + + + diff --git a/Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml b/Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml new file mode 100755 index 000000000..063e0624b --- /dev/null +++ b/Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml @@ -0,0 +1,46 @@ + + + + + + + + + cb_article_category + + + + articles + + + + + articles + + + cb_article_date + + + DESC + + + 6 + + + + + diff --git a/Blackbird_ContentManager/layout/catalogsearch_result_index.xml b/Blackbird_ContentManager/layout/catalogsearch_result_index.xml new file mode 100644 index 000000000..a6362fde1 --- /dev/null +++ b/Blackbird_ContentManager/layout/catalogsearch_result_index.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/Blackbird_ContentManager/layout/cms_index_index.xml b/Blackbird_ContentManager/layout/cms_index_index.xml new file mode 100644 index 000000000..126f4524a --- /dev/null +++ b/Blackbird_ContentManager/layout/cms_index_index.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + homepage-picture + homepage-slider + false + + + sliders + + + false + + + 1 + + + cb_slider_id + eq + home-slider + + + + + + + + + + + + + + + + brand-picture + brand-slider + slider--brands + + heading heading--first-level margin-0 + + + + sliders + + + false + + + 1 + + + cb_slider_id + eq + brands-slider + + + + + + + + heading heading--first-level margin-0 + + + + + + + + + diff --git a/Blackbird_ContentManager/layout/contentmanager_index_content.xml b/Blackbird_ContentManager/layout/contentmanager_index_content.xml new file mode 100755 index 000000000..8f7971ec2 --- /dev/null +++ b/Blackbird_ContentManager/layout/contentmanager_index_content.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/Blackbird_ContentManager/layout/contentmanager_index_contentlist.xml b/Blackbird_ContentManager/layout/contentmanager_index_contentlist.xml new file mode 100755 index 000000000..8f7971ec2 --- /dev/null +++ b/Blackbird_ContentManager/layout/contentmanager_index_contentlist.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/Snowdog_Acm/templates/content/view/articles/list.phtml b/Blackbird_ContentManager/templates/content/view/articles/list.phtml similarity index 100% rename from Snowdog_Acm/templates/content/view/articles/list.phtml rename to Blackbird_ContentManager/templates/content/view/articles/list.phtml diff --git a/Snowdog_Acm/templates/content/view/articles/view.phtml b/Blackbird_ContentManager/templates/content/view/articles/view.phtml similarity index 100% rename from Snowdog_Acm/templates/content/view/articles/view.phtml rename to Blackbird_ContentManager/templates/content/view/articles/view.phtml diff --git a/Snowdog_Acm/templates/content/view/sliders/list.phtml b/Blackbird_ContentManager/templates/content/view/sliders/list.phtml similarity index 100% rename from Snowdog_Acm/templates/content/view/sliders/list.phtml rename to Blackbird_ContentManager/templates/content/view/sliders/list.phtml diff --git a/Snowdog_Acm/templates/content/widget/sliders/list.phtml b/Blackbird_ContentManager/templates/content/widget/sliders/list.phtml similarity index 100% rename from Snowdog_Acm/templates/content/widget/sliders/list.phtml rename to Blackbird_ContentManager/templates/content/widget/sliders/list.phtml From 1cf83b9d0dca2cfb303b9ed5bef4016910941ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarek=20Krupi=C5=84ski?= Date: Mon, 30 May 2022 11:54:24 +0200 Subject: [PATCH 2/6] #88575 - Rename Snowdog_Acm --- Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml | 2 +- .../layout/CONTENT_TYPE_VIEW_articles.xml | 2 +- Blackbird_ContentManager/layout/cms_index_index.xml | 4 ++-- docs/guide/working-with-alpaca/images.md | 2 +- docs/guide/working-with-alpaca/sliders.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml b/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml index 3cdb1ea3a..9f99bb78b 100755 --- a/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml +++ b/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml @@ -7,7 +7,7 @@ homepage-picture @@ -74,7 +74,7 @@ brand-picture diff --git a/docs/guide/working-with-alpaca/images.md b/docs/guide/working-with-alpaca/images.md index 3932a117c..5a421ac4c 100644 --- a/docs/guide/working-with-alpaca/images.md +++ b/docs/guide/working-with-alpaca/images.md @@ -76,4 +76,4 @@ To make working with responsive images easier, we've created [picture.phtml](htt * If images for different screen sizes have different aspect ratios than the default image, add `img_ratio_width_...` and `img_ratio_height_...` attributes. ### Usage in PHTML Templates -Check [list.phtml](https://github.com/SnowdogApps/magento2-alpaca-theme/blob/master/Snowdog_Acm/templates/content/widget/sliders/list.phtml) to see an example of how to use `picture.phtml` inside another template. +Check [list.phtml](https://github.com/SnowdogApps/magento2-alpaca-theme/blob/master/Blackbird_ContentManager/templates/content/widget/sliders/list.phtml) to see an example of how to use `picture.phtml` inside another template. diff --git a/docs/guide/working-with-alpaca/sliders.md b/docs/guide/working-with-alpaca/sliders.md index bbce75ef1..5d2006ad6 100644 --- a/docs/guide/working-with-alpaca/sliders.md +++ b/docs/guide/working-with-alpaca/sliders.md @@ -124,7 +124,7 @@ After modules installation import content types from [Snowdog Alpaca ACM /import // required argument with uniq name From 5109b75f8d99ed7f6265036e5f9b3be7c28aa8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarek=20Krupi=C5=84ski?= Date: Mon, 30 May 2022 12:11:29 +0200 Subject: [PATCH 3/6] #88575 - Update docs --- docs/guide/introduction/third-party-module-compatibility.md | 1 - docs/guide/working-with-alpaca/blog.md | 4 ++-- docs/guide/working-with-alpaca/main-content-elements.md | 2 +- docs/guide/working-with-alpaca/sliders.md | 5 ++--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/guide/introduction/third-party-module-compatibility.md b/docs/guide/introduction/third-party-module-compatibility.md index 2b1e0d934..4edefd1f5 100644 --- a/docs/guide/introduction/third-party-module-compatibility.md +++ b/docs/guide/introduction/third-party-module-compatibility.md @@ -5,7 +5,6 @@ Besides modules included in [Alpaca Packages](#alpaca-packages), Alpaca supports * paradoxlabs/tokenbase * authorizenet/magento-module-creditcard * creativestyle/magesuite-magepack - * [snowdog/module-alpaca-acm](https://github.com/SnowdogApps/magento2-alpaca-acm) (Alpaca customisations for paid `blackbird/contentmanager` extension) * yireo/magento2-webp2 * **Paid:** diff --git a/docs/guide/working-with-alpaca/blog.md b/docs/guide/working-with-alpaca/blog.md index 53d649a29..f6352c1ce 100644 --- a/docs/guide/working-with-alpaca/blog.md +++ b/docs/guide/working-with-alpaca/blog.md @@ -4,9 +4,9 @@ ## Installation Required modules: * [Blackbird Advanced Content Manager](https://www.advancedcontentmanager.com/) -* [snowdog/module-alpaca-acm](https://github.com/SnowdogApps/magento2-alpaca-acm) -After modules installation import content types from [Snowdog Alpaca ACM /imports directory](https://github.com/SnowdogApps/magento2-alpaca-acm/tree/master/imports) in `Admin -> Content -> Content Manager -> Content Types -> Import Content Types button`. +After modules installation import content types from [ +magento2-alpaca-packages /imports directory](https://github.com/SnowdogApps/magento2-alpaca-packages/tree/master/imports) in `Admin -> Content -> Content Manager -> Content Types -> Import Content Types button`. ## Usage * Add articles in `Admin -> Content -> Contents -> Articles` * Blog will be available under [/blog](https://alpaca-community.snowdog.dev/blog) diff --git a/docs/guide/working-with-alpaca/main-content-elements.md b/docs/guide/working-with-alpaca/main-content-elements.md index 6f93a532f..3a4f92c96 100644 --- a/docs/guide/working-with-alpaca/main-content-elements.md +++ b/docs/guide/working-with-alpaca/main-content-elements.md @@ -11,4 +11,4 @@ ## Homepage * To make homepage sections easily customizable, we use [CMS blocks](https://docs.magento.com/user-guide/cms/blocks.html) and [widgets](https://docs.magento.com/user-guide/cms/widgets.html). See default structure [here](https://github.com/SnowdogApps/magento2-alpaca-theme/tree/master/Magento_Cms/layout/cms_index_index.xml). -* Additionally, we use [Blackbird Advanced Content Manager](https://www.advancedcontentmanager.com/) for the slider displayed on top of the homepage and top brands slider. See default structure [here](https://github.com/SnowdogApps/magento2-alpaca-acm/blob/master/view/frontend/layout/cms_index_index.xml). +* Additionally, we use [Blackbird Advanced Content Manager](https://www.advancedcontentmanager.com/) for the slider displayed on top of the homepage and top brands slider. See default structure [here](https://github.com/SnowdogApps/magento2-alpaca-theme/blob/master/Blackbird_ContentManager/layout/cms_index_index.xml). diff --git a/docs/guide/working-with-alpaca/sliders.md b/docs/guide/working-with-alpaca/sliders.md index 5d2006ad6..be569461e 100644 --- a/docs/guide/working-with-alpaca/sliders.md +++ b/docs/guide/working-with-alpaca/sliders.md @@ -101,9 +101,8 @@ Learn about Advanced Content Manager: [Documentation](https://www.advancedconten ### Installation Required modules: * [Blackbird Advanced Content Manager](https://www.advancedcontentmanager.com/) -* [snowdog/module-alpaca-acm](https://github.com/SnowdogApps/magento2-alpaca-acm) -After modules installation import content types from [Snowdog Alpaca ACM /imports directory](https://github.com/SnowdogApps/magento2-alpaca-acm/tree/master/imports) in `Admin -> Content -> Content Manager -> Content Types -> Import Content Types button`. +After modules installation import content types from [module-alpaca-packages /imports directory](https://github.com/SnowdogApps/magento2-alpaca-packages/tree/master/imports) in `Admin -> Content -> Content Manager -> Content Types -> Import Content Types button`. ### Usage 1. Add pictures for slider in `Admin -> Content -> Contents -> Pictures` 2. Add slider in `Admin -> Content -> Contents -> Sliders` @@ -168,4 +167,4 @@ After modules installation import content types from [Snowdog Alpaca ACM /import /> ``` - Check [Home Slider Example](https://github.com/SnowdogApps/magento2-alpaca-acm/blob/master/view/frontend/layout/cms_index_index.xml#L21) + Check [Home Slider Example](https://github.com/SnowdogApps/magento2-alpaca-theme/blob/master/Blackbird_ContentManager/layout/cms_index_index.xml#L21) From 0dc720c5351d85e925975e97470c520b2dd8a7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarek=20Krupi=C5=84ski?= Date: Tue, 31 May 2022 14:59:37 +0200 Subject: [PATCH 4/6] #88575 - Update migration guide --- docs/guide/migration-guide.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/guide/migration-guide.md b/docs/guide/migration-guide.md index 03b5e8f05..dde5f6547 100644 --- a/docs/guide/migration-guide.md +++ b/docs/guide/migration-guide.md @@ -1,5 +1,12 @@ # Migration guide -## >= 2.26.0 +## 2.27.0 +### Snowdog_Acm module +`snowdog/module-alpaca-acm` module is no longer needed. + +You can remove it from your project. +If you have overwritten files from `Snowdog_Acm` directory in your child theme, please move them to `Blackbird_ContentManager` and remove `Snowdog_Acm` directory. + +## 2.26.0 ### Tools You can use [this helper](https://github.com/SnowdogApps/theme-alpaca-upgrade-helper) to update child theme styles to Alpaca version >= 2.26.0 automatically. From 437a0acb3db8e1cedc3d1753e946af355b3fa6c7 Mon Sep 17 00:00:00 2001 From: Ola Date: Tue, 14 Jun 2022 10:29:56 +0200 Subject: [PATCH 5/6] #88575 formatting --- .../layout/CONTENT_LIST_VIEW_blog.xml | 14 +++++++------- .../layout/CONTENT_TYPE_VIEW_articles.xml | 14 +++++++------- .../templates/content/view/articles/list.phtml | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml b/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml index 9f99bb78b..cbdf6f116 100755 --- a/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml +++ b/Blackbird_ContentManager/layout/CONTENT_LIST_VIEW_blog.xml @@ -6,13 +6,13 @@ > @@ -25,8 +25,8 @@ articles diff --git a/Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml b/Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml index 4c7895856..179dede46 100755 --- a/Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml +++ b/Blackbird_ContentManager/layout/CONTENT_TYPE_VIEW_articles.xml @@ -6,13 +6,13 @@ > @@ -25,8 +25,8 @@ articles diff --git a/Blackbird_ContentManager/templates/content/view/articles/list.phtml b/Blackbird_ContentManager/templates/content/view/articles/list.phtml index 70d0a7445..7a9ba6de3 100644 --- a/Blackbird_ContentManager/templates/content/view/articles/list.phtml +++ b/Blackbird_ContentManager/templates/content/view/articles/list.phtml @@ -117,8 +117,8 @@ $recentArticles = $recentArticlesBlock->getCollection();
From eb8efc970f6cc5df9303ae3817eeda6131411424 Mon Sep 17 00:00:00 2001 From: Ola Date: Tue, 14 Jun 2022 10:32:09 +0200 Subject: [PATCH 6/6] #88575 update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce338f3c8..c49787084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ USE GITHUB ISSUE/PULL REQUEST NUMBERS, NOT INTERNAL ONE ### Removed - unnecessary !important flags (#537) - elasticsuite footer (#549) +- `Snowdog_Acm` module and moved files to `Blackbird_ContentManager` directory (#555) ### Updated ## [Released]