New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix module catalog js & css issues #10681

Merged
merged 11 commits into from Sep 26, 2018

Conversation

Projects
None yet
6 participants
@PierreRambaud
Contributor

PierreRambaud commented Sep 24, 2018

Questions Answers
Branch? 1.7.5.x
Description? Js & css issues
Type? bug fix
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket? Fixes #10676
Fixes #10667
Fixes #10666
Fixes #10663
Fixes #10661
Fixes #10665
How to test? Follow issues instructions.

This change is Reviewable

@PierreRambaud PierreRambaud changed the title from Fix/module manager to Fix module catalog js & css issues Sep 24, 2018

@@ -39,13 +39,13 @@
{% include 'PrestaShopBundle:Admin/Module/Includes:menu_top.html.twig' with { 'topMenuData': topMenuData, 'bulkActions': bulkActions } %}
<div id="module-recently-used-list" class="module-short-list">
<span id="recently-used_modules" class="module-search-result-wording">{{ 'Recently Used' | trans({}, 'Admin.Modules.Feature') }}</span>
<span id="recently-used_modules" class="module-search-result-title">{{ 'Recently Used' | trans({}, 'Admin.Modules.Feature') }}</span>

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Sep 25, 2018

Contributor

Please no useless upper case: Recently used. Domains are fine otherwise.

@LouiseBonnard

LouiseBonnard Sep 25, 2018

Contributor

Please no useless upper case: Recently used. Domains are fine otherwise.

This comment has been minimized.

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Was already defined like that in another PR :/

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Was already defined like that in another PR :/

@@ -734,7 +741,7 @@ class AdminModuleController {
self.animateEndUpload(() => {
if (result.status === true) {
if (result.is_configurable === true) {
const configureLink = window.moduleURLs.configurationPage.replace('1', result.module_name);
const configureLink = window.moduleURLs.configurationPage.replace(/:number:/, result.module_name);

This comment has been minimized.

@matks

matks Sep 25, 2018

Contributor

👍

@matks

matks Sep 25, 2018

Contributor

👍

<div class="row">
<div class="col-lg-6">
<div class="module-sorting-search-wording">
<span id="selected_modules" class="module-search-result-title module-search-result-wording">{{ '%nbModules% modules and services selected for you'|trans({'%nbModules%' : totalModules}, 'Admin.Modules.Feature') }}</span>

This comment has been minimized.

@matks

matks Sep 25, 2018

Contributor

Line too long

@matks

matks Sep 25, 2018

Contributor

Line too long

This comment has been minimized.

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Was the old file, just fix the indentation and little class changes :/

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Was the old file, just fix the indentation and little class changes :/

<span id="selected_modules" class="module-search-result-title module-search-result-wording">{{ '%nbModules% modules and services selected for you'|trans({'%nbModules%' : totalModules}, 'Admin.Modules.Feature') }}</span>
<span class="help-box" data-toggle="popover"
data-title="{{ "Selection"|trans({}, 'Admin.Modules.Feature') }}"
data-content="{{ "Customize your store with this selection of modules recommended for your shop, based on your country, language and version of PrestaShop. It includes the most popular modules from our Addons marketplace, and free partner modules."|trans({}, 'Admin.Modules.Help') }}">

This comment has been minimized.

@matks

matks Sep 25, 2018

Contributor

Line too long

@matks

matks Sep 25, 2018

Contributor

Line too long

This comment has been minimized.

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Was the old file, just fix the indentation and little class changes :/

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Was the old file, just fix the indentation and little class changes :/

<div id="modules-list-container-all" class="row modules-list" style="display: flex;" data-name="all">
{% for category in categories.subMenu %}
{% for module in category.modules %}
{% include 'PrestaShopBundle:Admin/Module/Includes:card_grid.html.twig' with { 'module': module, 'origin': origin|default('none'), 'level' : level, 'category': category.refMenu } %}

This comment has been minimized.

@matks

matks Sep 25, 2018

Contributor

Line too long

@matks

matks Sep 25, 2018

Contributor

Line too long

This comment has been minimized.

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Was the old file, just fix the indentation and little class changes :/

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Was the old file, just fix the indentation and little class changes :/

const selectorToToggle = (self.currentDisplay === self.DISPLAY_LIST) ?
this.addonItemListSelector :
this.addonItemGridSelector;
$(selectorToToggle).toggle(modulesCount !== (this.modulesList.length / 2));

This comment has been minimized.

@matks

matks Sep 25, 2018

Contributor

I do not understand why we should toggle based on whether the module count is equal to half the module list length ^^. What is the meaning ?

@matks

matks Sep 25, 2018

Contributor

I do not understand why we should toggle based on whether the module count is equal to half the module list length ^^. What is the meaning ?

This comment has been minimized.

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Don't ask me something I don't understand too :D I copy paste this part of code from the old module.js file :trollface:

@PierreRambaud

PierreRambaud Sep 25, 2018

Contributor

Don't ask me something I don't understand too :D I copy paste this part of code from the old module.js file :trollface:

@matks

matks approved these changes Sep 25, 2018

@matks matks merged commit 35d5037 into PrestaShop:1.7.5.x Sep 26, 2018

2 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@PierreRambaud PierreRambaud deleted the PierreRambaud:fix/module-manager branch Sep 26, 2018

@marionf marionf added this to the 1.7.5.0 milestone Sep 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment