Add support for custom newsletters #720
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gideonthomas
previously approved these changes
Sep 6, 2017
| @@ -54,4 +60,4 @@ def __str__(self): | |||
|
|
|||
| class Meta: | |||
| verbose_name = 'Custom Page' | |||
| verbose_name_plural = 'Custom Pages' | |||
| verbose_name_plural = 'Custom Pages' | |||
| newsletter = models.CharField( | ||
| max_length=100, | ||
| help_text="The (pre-existing) SalesForce newsletter to sign up for", | ||
| default="mozilla-leadership-network" |
There was a problem hiding this comment.
do you want to allow them to leave the field blank and then in the db it defaults to this? Or is this just a default for existing entries and they always have to put something in for this field in the admin interface?
There was a problem hiding this comment.
The latter. Also the fact that new entries get pre-populated with this in the admin is helpful too.
| @@ -69,7 +69,7 @@ <h1 class="h1-white">{{ page.landingpage.header }}</h1> | |||
| <div class="row">{% if page.landingpage.signup %} | |||
| <div class="cms col-md-6">{{ page.landingpage.content | safe }}</div> | |||
| <div class="col-md-5 offset-md-1"> | |||
| <div class="join-us half-width col" data-cta-header="{{ page.landingpage.signup.header | escape }}" data-cta-description="{{ page.landingpage.signup.description | escape }}"></div> | |||
| <div class="join-us half-width col" data-cta-header="{{ page.landingpage.signup.header | escape }}" data-cta-description="{{ page.landingpage.signup.description | escape }}" data-newsletter="{{ page.landingpage.signup.newsletter }}"></div> | |||
There was a problem hiding this comment.
don't know if you want to escape this as well?
There was a problem hiding this comment.
Nope, just a string here, not HTML.
alanmoo
force-pushed
the
multi-newsletter
branch
from
39a969f to
b946637
Compare
|
@gideonthomas I re-added the newline, think I need you to approve again. |
gideonthomas
approved these changes
Sep 6, 2017
gvn
pushed a commit
that referenced
this pull request
Sep 18, 2017
gvn
pushed a commit
that referenced
this pull request
Sep 18, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For #691
This allows (permissioned) users to type in the newsletter name when creating a signup component, and passes that name to the signup form when it gets used on opportunity pages.