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.

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 empty slots in builder #6810

Merged
merged 5 commits into from Dec 5, 2018

Conversation

Projects
7 participants
@kuzmany
Copy link
Contributor

kuzmany commented Nov 4, 2018

Please be sure you are submitting this against the staging branch.

Q A
Bug fix?
New feature?
Automated tests included?
Related user documentation PR URL
Related developer documentation PR URL
Issues addressed (#s or URLs) #5749
BC breaks?
Deprecations?

Description:

This is follow up to #6454 based on this issue #5749
If you leave your slots empty, then you can't edit it again.
This PR added placeholder If slot is empty, then you can edit it.

image

Steps to reproduce the bug:

  1. Create email and open builder
  2. Add text slot and remove default text
  3. You can edit slot

Steps to test this PR:

  1. Repeat all steps
  2. See If you can edit slot without content
    You can test text, dynamic content and code mode slot.

@kuzmany kuzmany added this to the 2.15.0 milestone Nov 4, 2018

kuzmany added some commits Nov 4, 2018

@chriscalabro

This comment has been minimized.

Copy link

chriscalabro commented Nov 7, 2018

Works as described when working with text and dynamic content slot types. But when using a code mode slot, the edit icon remains even after I add content to the slot. As in, it's always visible, whether slot contains content or not.

@kuzmany kuzmany added the WIP label Nov 8, 2018

@kuzmany kuzmany removed the WIP label Nov 8, 2018

@kuzmany

This comment has been minimized.

Copy link
Contributor Author

kuzmany commented Nov 8, 2018

@chriscalabro Hi, re-test please with last commit

@chriscalabro
Copy link

chriscalabro left a comment

@kuzmany now working as described 👍

@moskoweb

This comment has been minimized.

Copy link

moskoweb commented Nov 21, 2018

I think it's best if you leave the icon out of the box, but in the line that is empty, so you can click and edit.

div:empty[data-slot]:before, div.empty[data-slot]:before, .codemodeHtmlContainer:empty:before {
    content: "\f044";
    font: normal normal normal 14px/1 FontAwesome;
    position: absolute;
    left: -1.5em; // left line
    top: 2px;
    color: gray;
    font-size: 1em; // minimal size
}
@YosuCadilla

This comment has been minimized.

Copy link

YosuCadilla commented Dec 4, 2018

Tested, I can see the placeholders and I can edit after saving

@npracht npracht moved this from To do to Tested once in Testing 2.15.0 Dec 4, 2018

@spatialy

This comment has been minimized.

Copy link

spatialy commented Dec 4, 2018

Tested and working as expected ... the placeholders are editable when re-editing.

@kuzmany kuzmany moved this from Tested once to Ready to commit in Testing 2.15.0 Dec 4, 2018

@Woeler Woeler merged commit 3f6a62f into mautic:staging Dec 5, 2018

2 checks passed

Scrutinizer Analysis: 1 new issues – Tests: passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

Testing 2.15.0 automation moved this from Ready to commit to Merged Dec 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.