Skip to content

Update guides.py #129

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

Open
nadiaff wants to merge 3 commits into
base: production
Choose a base branch
from
Open

Update guides.py #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fce8f84
Update guides.py
nadiaff Jul 5, 2017
1f94eb2
Update guides.py
nadiaff Jul 5, 2017
6d7e819
Added link to resend e-mail
nadiaff Jul 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion newparp/templates/account/user_new.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,11 @@
{% block content: %}
<h2>Awaiting activation.</h2>
<p>Thank you for signing up! Before you start using MSPARP, please complete this final step to complete your registration. We've sent you an e-mail to confirm your registration. Please click the link provided in the e-mail to activate your account. The e-mail may be in your spam folder so make sure to check there too.</p>
<p>If you have not received an e-mail within twenty four hours, contact us through <a href="http://help.msparp.com">our support ticket system</a>.</p>
<p>If you have not received an e-mail within a few hours, click the button below to have a new verification e-mail sent.</p>
<form action="{{url_for("settings_change_email")}}" method="post">
<input type="hidden" name="token" value="{{g.csrf_token}}">
<input type="hidden" name="email_address" value="{{ g.user.email_address }}">
<p><button type="submit">Re-send verification e-mail</button></p>
</form>
<p>As a last resort, you can contact us through <a href="http://help.msparp.com">our support ticket system</a> for assistance, but be sure to check your SPAM FOLDER beforehand in case the e-mail ended up there.</p>
{% endblock %}
4 changes: 2 additions & 2 deletions newparp/views/guides.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@


def user_guide():
r = requests.get("https://karry.terminallycapricio.us/userguide/duplicateguide.html")
r = requests.get("http://alpacaweb.net/guides/userguide.html")
r.encoding = r.apparent_encoding
return r.text, r.status_code


def bbcode_guide():
r = requests.get("https://karry.terminallycapricio.us/userguide/bbcodeguide.html")
r = requests.get("http://alpacaweb.net/guides/bbcode.html")
r.encoding = r.apparent_encoding
return r.text, r.status_code