Fixed paragraph formatting and broken links within studio welcome email#3696
Conversation
| 'domain': request.META.get('HTTP_ORIGIN') or "https://{}".format( | ||
| request.get_host() or Site.objects.get_current().domain), | ||
| 'domain': {"domain": "https://{}".format( | ||
| Site.objects.get_current().domain)}, |
There was a problem hiding this comment.
I missed this, but looks like we copy and pasted the whole dictionary, not just the value for "domain"
There was a problem hiding this comment.
Also, do you have pre-commit installed? I would have expected it to reformat this code. I actually think it's missing from the Studio README/dev setup now that I look...
There was a problem hiding this comment.
There's also this outstanding issue: #2945 which means that we can't enforce the Python linting checks either.
There was a problem hiding this comment.
@rtibbles Ah right, I forgot we talked about handling that before the websockets work...
There was a problem hiding this comment.
We couldn't though, because my event log PR hadn't been merged! We'll do it once we merge the websockets work instead.
rtibbles
left a comment
There was a problem hiding this comment.
Code changes make sense to me! One question about the slideshow itself.
| <b>{% translate "Slide gif format:" %}</b> | ||
| <a | ||
| href="https://docs.google.com/presentation/d/1diRou-RYk7-gYkpMCDB5zs9C7Ywo_qifH0l78nvwVCY/edit#slide=id.g8b5cff85a9_0_78" | ||
| href="https://docs.google.com/presentation/d/1diRou-RYk7-gYkpMCDB5zs9C7Ywo_qifH0l78nvwVCY/edit#slide=id.g6b950d4fd1_0_360" |
There was a problem hiding this comment.
Thoughts on linking to a published version of the slideshow instead of the source document?
https://docs.google.com/presentation/d/e/2PACX-1vRLHvRytsoLdOCv5EMlm5_KRKYHdtwpt_FUkC3sLeW5L12Tw9KZj5GA6klbq8dQB1nVtEBGn73GZsU9/pub?start=true&loop=true&delayms=30000&slide=id.g6b950d4fd1_0_360
There was a problem hiding this comment.
I think linking to a published version would be a preferable option.
There was a problem hiding this comment.
I checked with @lauradanforth and she agreed! If you can update the link, then I think we're good to merge here.
bjester
left a comment
There was a problem hiding this comment.
Lets test it out on the hotfixes server
Summary
Description of the change(s) you made
This PR fixes the broken links and updates the spacing between the paragraphs in the Studio welcome email. A new
SITEobject has been added to include the hotfixes branch, somedomainvariables forSITEobjects have been updated, and the way theSITE_IDis retrieved withinsettings.pyhas been refactored.References
Fixes #3677
Contributor's Checklist
PR process:
CHANGELOGlabel been added to this PR. Note: items with this label will be added to the CHANGELOG at a later timedocslabel has been added if this introduces a change that needs to be updated in the user docs?requirements.txtfiles also included in this PRStudio-specifc:
notranslateclass been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)pages,components, andlayoutsdirectories as described in the docsTesting:
Reviewer's Checklist
This section is for reviewers to fill out.
yarnandpip)