Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Adds helper card in cms page #13163

Closed
wants to merge 28 commits into from
Closed

Adds helper card in cms page #13163

wants to merge 28 commits into from

Conversation

tomas862
Copy link
Contributor

@tomas862 tomas862 commented Apr 3, 2019 •
edited

Questions Answers
Branch? develop
Description? Adds helper card in cms page located in /admin-dev/index.php/improve/design/cms-pages
Type? improvement
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Check the page how it looks like - also when everything looks okey, try to click on 'x' to remove that block. Before the testing make sure assets are up to date by running npm run build

This change is Reviewable

@rblaurin
Send $format in hook
d31bde8 
Allow Hook additionalCustomerFormFields to modify the fields positions.
@rblaurin
Send fields as parameter
bc81891
@prestonBot prestonBot added develop Branch Improvement Type: Improvement Waiting for wording Status: action required, waiting for wording labels Apr 3, 2019
@matks matks added the migration symfony migration project label Apr 3, 2019
@matks
Copy link
Contributor

matks commented Apr 3, 2019

@tomas862 Do you feel confident about the RTL behavior :trollface: ?

@tomas862
Copy link
Contributor Author

tomas862 commented Apr 3, 2019

haha, no :D but I guess existing showcase cards had this thing handled? 🤔

@tomas862
Copy link
Contributor Author

tomas862 commented Apr 3, 2019

@tomas862 Do you feel confident about the RTL behavior :trollface: ?

close enough:

Screenshot(12)

LouiseBonnard
LouiseBonnard reviewed Apr 3, 2019
View reviewed changes
src/PrestaShopBundle/Resources/views/Admin/Improve/Design/Cms/Blocks/showcase_card.html.twig Outdated
</div>
<div class="showcase-card__right">
<h2>{{ 'Create meaningful content'|trans({}, 'Admin.Design.Help') }}</h2>
<p>{{ 'PrestaShop enables you to create content pages as easily as you would create product pages. You can add static pages in the top menu using the "Main menu" module.'|trans({}, 'Admin.Design.Help') }}</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that, for my part, I don't have the same wording:

Because it is not just selling products but also creating a universe, build pages to tell stories and catch your visitors’ interest to turn them into loyal customers.

@TristanLDD, do you know what is the final wording?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to #10434 (comment) the wording of Louise is the right one @tomas862 can you please update it ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matks done ;)

@matks matks mentioned this pull request Apr 3, 2019
Closed
7 tasks
@matks
Copy link
Contributor

matks commented Apr 4, 2019

haha, no :D but I guess existing showcase cards had this thing handled? 🤔

I checked, you need to add CSS class img-rtl

See https://github.com/PrestaShop/PrestaShop/pull/12809/files

@tomas862 tomas862 changed the base branch from develop to 1.7.6.x April 9, 2019 06:34
matks and others added 10 commits April 10, 2019 13:25
@matks
Merge pull request PrestaShop#13266 from matks/merge176xtodevelop
45d6469 
Merge 1.7.6.x to develop - 10/04/2019
@matks
Merge pull request PrestaShop#13200 from sarjon/annotation-security-c…
64d201f 
…hecker

Add SecurityAnnotation linter
@matks
Merge branch '1.7.6.x' of github.com:PrestaShop/PrestaShop into merge…
41c0993 
…176xtodevelop-2
@PierreRambaud
Merge pull request PrestaShop#13359 from matks/merge176xtodevelop-2
ee9e2be 
Merge 1.7.6.x to develop - 11/04/2019
@matks
Merge branch '1.7.6.x' of github.com:PrestaShop/PrestaShop into merge…
9bbb406 
…176xtodevelop-3
@matks
Merge pull request PrestaShop#13375 from matks/merge176xtodevelop-3
eaafecb 
Merge 1.7.6.x to develop - 12/04/2019
@tomas862
adds showcase card for cms page
7ba8cf9
@tomas862
adds card close functionality
f0c7f22
@tomas862
adds styles which helps to support rtl for image
648ea41
@tomas862
changes description of showcase card
c5f0653
@tomas862 tomas862 force-pushed the improvements/helper-card-in-cms-page branch from 5dbd516 to c5f0653 Compare April 15, 2019 07:25
@matks
Copy link
Contributor

matks commented Apr 15, 2019

@tomas862 I'm sorry but your commits history looks bad :/ I think you might have used develop as base branch instead of 1.7.6.x

@tomas862
Copy link
Contributor Author

snap - old habits of rebasing... :/ gonna cherry pick this PR and I'll create new one instead

@tomas862 tomas862 force-pushed the improvements/helper-card-in-cms-page branch from 5ae0b27 to c5f0653 Compare April 15, 2019 09:20
@tomas862 tomas862 mentioned this pull request Apr 15, 2019
Merged
@tomas862 tomas862 closed this Apr 15, 2019
@tomas862
Copy link
Contributor Author

Forwarded to #13404

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

@matks matks matks left review comments

@LouiseBonnard LouiseBonnard LouiseBonnard left review comments

Assignees
No one assigned
Labels
develop Branch Improvement Type: Improvement migration symfony migration project Waiting for wording Status: action required, waiting for wording
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@tomas862 @matks @LouiseBonnard @prestonBot @rblaurin @sarjon @123monsite-regis @zuk3975 @PierreRambaud