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 import form alignment #10741

Merged
merged 4 commits into from Oct 1, 2018

Conversation

Projects
None yet
6 participants
@sarjon
Member

sarjon commented Sep 27, 2018

Questions Answers
Branch? 1.7.5.x
Description? See issue.
Type? bug fix
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket? #10686
How to test? Check issue.

This change is Reviewable

@@ -27,31 +27,33 @@
{% trans_default_domain 'Admin.Advparameters.Feature' %}
{% block content %}
{% if importForm is defined %}
<div class="container">
{% if importForm is defined %}

This comment has been minimized.

@PierreRambaud

PierreRambaud Sep 27, 2018

Contributor

why two spaces here and four spaces above?

This comment has been minimized.

@sarjon

sarjon Sep 27, 2018

Member

i cant see 4 spaces above. :/ what do you mean?

This comment has been minimized.

@PierreRambaud

PierreRambaud Sep 27, 2018

Contributor

Sorry speaking about import_panel.html.twig file line 34 / 35 6 spaces and line 167 / 168 there is 4 spaces

This comment has been minimized.

@sarjon

sarjon Sep 27, 2018

Member

done.

<label class="form-control-label">{{ 'Field separator'|trans }}</label>
{{ form_errors(importForm.separator) }}
{{ form_widget(importForm.separator) }}
<small class="form-text">{{ 'e.g. '|trans({}, 'Admin.Advparameters.Help') }} 1; Blouse; 129.90; 5</small>

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Sep 28, 2018

Contributor

There is a blank space at the end of the string.

This comment has been minimized.

@sarjon

sarjon Sep 28, 2018

Member

translation key contains this space. :)

<label class="form-control-label">{{ 'Multiple value separator'|trans }}</label>
{{ form_errors(importForm.multiple_value_separator) }}
{{ form_widget(importForm.multiple_value_separator) }}
<small class="form-text">{{ 'e.g. '|trans({}, 'Admin.Advparameters.Help') }} Blouse; red.jpg, blue.jpg, green.jpg; 129.90</small>

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Sep 28, 2018

Contributor

Same here.

@matks

matks approved these changes Sep 28, 2018

@ntiepresta ntiepresta added QA ✔️ and removed waiting for QA labels Sep 28, 2018

@PierreRambaud PierreRambaud merged commit 82c406a into PrestaShop:1.7.5.x Oct 1, 2018

1 of 2 checks passed

Codacy/PR Quality Review Codacy was unable to analyse your pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@PierreRambaud

This comment has been minimized.

Contributor

PierreRambaud commented Oct 1, 2018

Thanks @sarjon

@matks matks added this to the 1.7.5.0 milestone Oct 9, 2018

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