diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 99cdb8af7..dbc1871a1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,9 +3,9 @@ ### Understanding Before getting started, you should read our article introducing the project: -[We're Building A Starter Theme For PrestaShop 1.7.8 and 8](https://build.prestashop.com/news/new-theme-announce/). +[We're Building A Starter Theme For PrestaShop 1.7.8 and 8](https://build.prestashop-project.org/news/2022/new-theme-announce/). -If you are contributing to this theme, you are probably interested in PrestaShop development as well. Please the following article to get familiar with [PrestaShop branching model](http://build.prestashop.com/news/introducing-new-branching-model-prestashop/). +If you are contributing to this theme, you are probably interested in PrestaShop development as well. Please the following article to get familiar with [PrestaShop branching model](https://build.prestashop-project.org/news/2015/introducing-new-branching-model-prestashop/). You got any questions ? Join the open source slack. @@ -15,10 +15,10 @@ You got any questions ? Join the open source slack. There are few things to do before you are ready to contribute. -1. Check your _Git_ configuration. Read [Set Up Your Git For Contributing](http://build.prestashop.com/howtos/misc/set-up-your-git-for-contributing/) +1. Check your _Git_ configuration. Read [Set Up Your Git For Contributing](https://build.prestashop-project.org/howtos/misc/set-up-your-git-for-contributing/) 2. Check your editor configuration. The rules are defined in `.editorconfig`. Do it manually or [install the available plugin](http://editorconfig.org/#download). 3. Make sure you at least have [NodeJS 14](https://nodejs.org/en/download/) installed. -4. You should install the theme inside a PrestaShop instance, please refer to [the developers docummentation of the project](https://devdocs.prestashop.com/1.7/basics/installation/). +4. You should install the theme inside a PrestaShop instance, please refer to [the developers docummentation of the project](https://devdocs.prestashop-project.org/1.7/basics/installation/). ### How to build the theme @@ -35,7 +35,7 @@ then build assets: ### Good practices - Follow the BEM convention -- Be careful about creating SCSS files in the right folder, refer to the [documentation](https://build.prestashop.com/hummingbird/) for further informations. +- Be careful about creating SCSS files in the right folder, refer to the [documentation](https://build.prestashop-project.org/hummingbird/) for further informations. - When you want to submit a PR, please make sure that you ran both linters using `npm run lint-fix && npm run scss-fix` and fixed every lint issues. - If your PR is a work in progress, make sure that you use the Github draft mode. - Fill the PR template as much as possible, it's important to speed the process of testing, reviewing... diff --git a/README.md b/README.md index 5f0ab9a40..9acc2a27c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hummingbird theme -This is a PrestaShop's theme we are working on. Please, if you work on this theme, use the `8.0.x` branch of PrestaShop to make sure this theme is compatible with the latest `8.x` version. +This is a PrestaShop's theme we are working on. Please, if you work on this theme, use the `8.1.x` branch of PrestaShop to make sure this theme is compatible with the latest `8.1.x` version. [Read more](https://build.prestashop.com/news/new-theme-announce/) about this theme on the blog. @@ -9,7 +9,7 @@ This is a PrestaShop's theme we are working on. Please, if you work on this them ## How to build assets -Same as the PrestaShop project, you need at least **NodeJS 14.x** and **NPM 7** in order to build the project. +Same as the PrestaShop project, you need at least **NodeJS 16.x** and **NPM 8** in order to build the project. First you need to install every node module: diff --git a/config/theme.yml b/config/theme.yml index bdccb4c4c..30fe18104 100644 --- a/config/theme.yml +++ b/config/theme.yml @@ -1,6 +1,6 @@ -name: hummingbird +name: hummingbird display_name: Hummingbird -version: 0.1.5 +version: 0.2.0 author: name: "PrestaShop Team" email: "pub@prestashop.com" @@ -59,6 +59,7 @@ global_settings: - blockwishlist displayCustomerAccount: - blockwishlist + - psgdpr displayMyAccountBlock: - blockwishlist displayNav1: diff --git a/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl b/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl index 753f2033a..95400d6d4 100644 --- a/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl +++ b/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl @@ -9,9 +9,7 @@ > - + :class="{ldelim}show: !isHidden{rdelim}" + > diff --git a/modules/blockwishlist/views/templates/components/modals/create.tpl b/modules/blockwishlist/views/templates/components/modals/create.tpl index 01e0a1f3a..184c6b3ee 100644 --- a/modules/blockwishlist/views/templates/components/modals/create.tpl +++ b/modules/blockwishlist/views/templates/components/modals/create.tpl @@ -15,9 +15,7 @@ > - + :class="{ldelim}show: !isHidden{rdelim}" + > diff --git a/modules/blockwishlist/views/templates/components/modals/delete.tpl b/modules/blockwishlist/views/templates/components/modals/delete.tpl index 6c0ef106a..e9a4d3b93 100644 --- a/modules/blockwishlist/views/templates/components/modals/delete.tpl +++ b/modules/blockwishlist/views/templates/components/modals/delete.tpl @@ -20,9 +20,7 @@ > - + :class="{ldelim}show: !isHidden{rdelim}" + > diff --git a/modules/blockwishlist/views/templates/components/modals/login.tpl b/modules/blockwishlist/views/templates/components/modals/login.tpl index 8eb930b01..9edc2ecac 100644 --- a/modules/blockwishlist/views/templates/components/modals/login.tpl +++ b/modules/blockwishlist/views/templates/components/modals/login.tpl @@ -10,9 +10,7 @@ > @@ -56,9 +49,6 @@ + :class="{ldelim}show: !isHidden{rdelim}" + > diff --git a/modules/blockwishlist/views/templates/components/modals/rename.tpl b/modules/blockwishlist/views/templates/components/modals/rename.tpl index c72361146..c66f8ab60 100644 --- a/modules/blockwishlist/views/templates/components/modals/rename.tpl +++ b/modules/blockwishlist/views/templates/components/modals/rename.tpl @@ -14,9 +14,7 @@ > - + :class="{ldelim}show: !isHidden{rdelim}" + > diff --git a/modules/blockwishlist/views/templates/components/modals/share.tpl b/modules/blockwishlist/views/templates/components/modals/share.tpl index 201f64683..f43608165 100644 --- a/modules/blockwishlist/views/templates/components/modals/share.tpl +++ b/modules/blockwishlist/views/templates/components/modals/share.tpl @@ -14,9 +14,7 @@ > - + :class="{ldelim}show: !isHidden{rdelim}" + > diff --git a/modules/productcomments/views/templates/hook/average-grade-stars.tpl b/modules/productcomments/views/templates/hook/average-grade-stars.tpl new file mode 100644 index 000000000..fc99bebdb --- /dev/null +++ b/modules/productcomments/views/templates/hook/average-grade-stars.tpl @@ -0,0 +1,15 @@ +{** + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + *} + +{if $nb_comments != 0} +
+
+ {if isset($showNbComments) && $showNbComments} +
({$nb_comments})
+ {elseif isset($showGradeAverage) && $showGradeAverage} +
({$grade|number_format:1})
+ {/if} +
+{/if} diff --git a/modules/productcomments/views/templates/hook/empty-product-comment.tpl b/modules/productcomments/views/templates/hook/empty-product-comment.tpl index 314582606..dd6f3ffa3 100644 --- a/modules/productcomments/views/templates/hook/empty-product-comment.tpl +++ b/modules/productcomments/views/templates/hook/empty-product-comment.tpl @@ -3,7 +3,7 @@ * file that was distributed with this source code. *} -
+
{if $post_allowed} + {/if} + {else} + {include file='module:productcomments/views/templates/hook/average-grade-stars.tpl' grade=$average_grade showGradeAverage=true} + + {/if} +
+{/if} diff --git a/modules/productcomments/views/templates/hook/product-comments-list.tpl b/modules/productcomments/views/templates/hook/product-comments-list.tpl index 730061c89..9fcc350d4 100644 --- a/modules/productcomments/views/templates/hook/product-comments-list.tpl +++ b/modules/productcomments/views/templates/hook/product-comments-list.tpl @@ -2,42 +2,49 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. *} + -
-
-
- - {l s='Comments' d='Modules.Productcomments.Shop'} ({$nb_comments}) -
- {include file='module:productcomments/views/templates/hook/average-grade-stars.tpl' grade=$average_grade} +
+
+ {l s='Comments' d='Modules.Productcomments.Shop'} ({$nb_comments})
+ {include file='module:productcomments/views/templates/hook/average-grade-stars.tpl' grade=$average_grade showGradeAverage=true showNbComments=false}
{include file='module:productcomments/views/templates/hook/product-comment-item-prototype.tpl' assign="comment_prototype"} {include file='module:productcomments/views/templates/hook/empty-product-comment.tpl'} -
-
-
+ +
-
-