Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
zulip/templates/zerver/confirm_continue_registrati...

60 lines
2.6 KiB
HTML
Raw Normal View History

auth.py: Add confirmation handlers for signup. These handlers will kick into action when is_signup is False. In case the account exists, the user will be logged in, otherwise, user will be asked if they want to proceed to registration.
2017-04-20 08:25:15 +02:00
{% extends "zerver/portico_signup.html" %}
{% block portico_content %}
<div class="app register-page">
templates: Clean up visuals for account-not-found SSO flow. Also, clarify that the account that isn't found is your Zulip account, not a GitHub/Google Oauth account.
2017-05-13 21:40:23 +02:00
<div class="app-main confirm-continue-page-container">
auth.py: Add confirmation handlers for signup. These handlers will kick into action when is_signup is False. In case the account exists, the user will be logged in, otherwise, user will be asked if they want to proceed to registration.
2017-04-20 08:25:15 +02:00
<div class="center-container">
<div class="center-block">
templates: Clean up visuals for account-not-found SSO flow. Also, clarify that the account that isn't found is your Zulip account, not a GitHub/Google Oauth account.
2017-05-13 21:40:23 +02:00
<div class="register-form new-style">
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
<div class="lead">
<h1 class="get-started">{{ _("Zulip account not found.") }}</h1>
</div>
<div class="white-box">
{% if invalid_email %}
{# If the email address is invalid, we can't send the user #}
{# to the preregistered user code path. #}
<p>
{% trans %}
Please click the following button if you wish to register.
{% endtrans %}
</p>
Renamed 'Register' to 'Sign up' including translations
2017-12-14 06:46:57 +01:00
<a href='/register/' class="button-new sea-green">Sign up</a>
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
{% else %}
<p>
{% trans %}
templates: Clean up visuals for account-not-found SSO flow. Also, clarify that the account that isn't found is your Zulip account, not a GitHub/Google Oauth account.
2017-05-13 21:40:23 +02:00
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
No account found for {{ email }}. Would you like to register instead?
templates: Clean up visuals for account-not-found SSO flow. Also, clarify that the account that isn't found is your Zulip account, not a GitHub/Google Oauth account.
2017-05-13 21:40:23 +02:00
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
{% endtrans %}
</p>
<div style="text-align: left;">
<form class="form-inline" id="send_confirm" name="send_confirm"
linter: Enforce 2 space indents on tags spread over multiple lines. We make some specific cases of tags use 2 space indents. The case description: * A tag with opening tag spread over multiple lines and closing tag on the same line as of the closing angle bracket of the opening tag. * A tag with opening tag spread over multiple lines and closing tag not on the same line as of the closing angle bracket of the opening tag. Example: Case 1: Not linted: <button type="button" class="btn btn-primary btn-small">{{t "Yes" }}</button> After linting: <button type="button" class="btn btn-primary btn-small">{{t "Yes" }}</button> Case 2: Before linting: <div class = "foo" id = "bar" role = "whatever"> {{ bla }} </div> After linting: <div class = "foo" id = "bar" role = "whatever"> {{ bla }} </div>
2018-04-05 08:38:46 +02:00
action="/login/" method="get">
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
<input type="hidden"
linter: Make html singleton tags use 2 space indentation.
2018-04-03 10:07:23 +02:00
id="email"
name="email"
value="{{ email }}" />
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
<button>
{{ _("Go back to login") }}
</button>
</form>
signup: Redirect to /register instead of sending mail when user has no account. When a user with no account tries to login using GitHub/Google auth they are given an option to register. If the user chooses to register, a mail is sent for verification and the user has to continue registration as if they signed up using email. This is confusing and a bit annoying, so instead of sending email I have changed the procedure to just redirect to /register where they can start registration over and proceed normally. An ideal implementation for this would be to just allow users to continue registration without email or going back to register. [greg: tweaked to keep existing user-facing text]
2017-12-07 13:54:51 +01:00
{# TODO: Ideally, this should allow users to register #}
{# without going over to /register and re-authenticating. #}
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
<form class="form-inline" id="send_confirm" name="send_confirm"
linter: Enforce 2 space indents on tags spread over multiple lines. We make some specific cases of tags use 2 space indents. The case description: * A tag with opening tag spread over multiple lines and closing tag on the same line as of the closing angle bracket of the opening tag. * A tag with opening tag spread over multiple lines and closing tag not on the same line as of the closing angle bracket of the opening tag. Example: Case 1: Not linted: <button type="button" class="btn btn-primary btn-small">{{t "Yes" }}</button> After linting: <button type="button" class="btn btn-primary btn-small">{{t "Yes" }}</button> Case 2: Before linting: <div class = "foo" id = "bar" role = "whatever"> {{ bla }} </div> After linting: <div class = "foo" id = "bar" role = "whatever"> {{ bla }} </div>
2018-04-05 08:38:46 +02:00
action="/register/" method="get">
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
<button class="outline">
Renamed 'Register' to 'Sign up' including translations
2017-12-14 06:46:57 +01:00
{{ _("Sign up instead") }}
portico-signup: Clean up confirm continue register page. This cleans up the styling of the page by adding the white box around the text content, and by making the header the same `.get-started` class as other headers in the portico-signup group.
2017-08-28 19:24:08 +02:00
</button>
</form>
</div>
{% endif %}
frontend: Edit confirm_continue_registration.html to be clearer. Fixes #5707.
2017-07-17 17:31:05 +02:00
</div>
auth.py: Add confirmation handlers for signup. These handlers will kick into action when is_signup is False. In case the account exists, the user will be logged in, otherwise, user will be asked if they want to proceed to registration.
2017-04-20 08:25:15 +02:00
</div>
</div>
</div>
</div>
<div class="footer-padder"></div>
</div>
{% endblock %}