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...

53 lines
2.1 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" %}
templates: Add HTML title element to templates that extend base/portico. Adds HTML title elements to templates that extend either `base.html`, `portico.html` or `portico_signup.html`, and that are not website portico landing pages that will use the `PAGE_TITLE` variable to set the HTML title element (see following commit in series). Also, updates some templates for missing translation tags. As a general rule, we want the title element (and page content) translated. Exceptions that are updated in this commit are templates used in the development environment, analytics templates that are used by staff and templates related to Zephyr.
2022-09-06 12:04:03 +02:00
{% block title %}
<title>{{ _("Account not found") }} | Zulip</title>
{% endblock %}
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
{% 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">
<p>
{% trans %}
portico: Update text on confirm_continue_registration. A common path is a new user goes to realm_uri, which redirects to realm_uri/login, and clicks the google auth button thinking it is a registration button. This commit just changes the wording on the page they land on to be friendlier for that use case.
2018-04-25 02:59:20 +02:00
No account found for {{ 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
{% endtrans %}
</p>
portico: Update text on confirm_continue_registration. A common path is a new user goes to realm_uri, which redirects to realm_uri/login, and clicks the google auth button thinking it is a registration button. This commit just changes the wording on the page they land on to be friendlier for that use case.
2018-04-25 02:59:20 +02:00
<div style="text-align: center;">
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="/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>
portico: Update text on confirm_continue_registration. A common path is a new user goes to realm_uri, which redirects to realm_uri/login, and clicks the google auth button thinking it is a registration button. This commit just changes the wording on the page they land on to be friendlier for that use case.
2018-04-25 02:59:20 +02:00
{{ _("Log in with another account") }}
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>
templates: Mark all void tags as self-closing. This reverses the policy that was set, but incompletely enforced, by commit 951514dd7dd2fafb67e9e9c6930d31b9295741c0. The self-closing tag syntax is clearer, more consistent, simpler to parse, compatible with XML, preferred by Prettier, and (most importantly now) required by FormatJS. Signed-off-by: Anders Kaseorg <anders@zulip.com>
2021-04-21 00:46:14 +02:00
<br />
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"
auth: Make "Continue to registration" actually register you. The main change here is to send a proper confirmation link to the frontend in the `confirm_continue_registration` code path even if the user didn't request signup, so that we don't need to re-authenticate the user's control over their email address in that flow. This also lets us delete some now-unnecessary code: The `invalid_email` case is now handled by HomepageForm.is_valid(), which has nice error handling, so we no longer need logic in the context computation or template for `confirm_continue_registration` for the corner case where the user somehow has an invalid email address authenticated. We split one GitHub auth backend test to now cover both corner cases (invalid email for realm, and valid email for realm), and rewrite the Google auth test for this code path as well. Fixes #5895.
2018-04-23 00:12:52 +02:00
action="{{ continue_link }}" 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">
portico: Update text on confirm_continue_registration. A common path is a new user goes to realm_uri, which redirects to realm_uri/login, and clicks the google auth button thinking it is a registration button. This commit just changes the wording on the page they land on to be friendlier for that use case.
2018-04-25 02:59:20 +02:00
{{ _("Continue to registration") }}
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>
confirmation: Fix "continue to registration" full name handling. Apparently, the "continue to registration" flow used a subtly invalid way of encoding the full name. We put in the query part of the action URL of the HTML form, but apparently HTML forms with a `GET` type will ignore the query part (replacing it with any input values), which makes sense but doesn't do what we want here. There are a few sane ways to fix it, but given that the encoding logic we had before for including the name in the URL was ugly, I'm pretty happy with just adding a hidden input to the form for the name.
2019-01-29 21:20:31 +01:00
{% if full_name %}
templates: Mark all void tags as self-closing. This reverses the policy that was set, but incompletely enforced, by commit 951514dd7dd2fafb67e9e9c6930d31b9295741c0. The self-closing tag syntax is clearer, more consistent, simpler to parse, compatible with XML, preferred by Prettier, and (most importantly now) required by FormatJS. Signed-off-by: Anders Kaseorg <anders@zulip.com>
2021-04-21 00:46:14 +02:00
<input type="hidden" name="full_name" value="{{ full_name }}" />
confirmation: Fix "continue to registration" full name handling. Apparently, the "continue to registration" flow used a subtly invalid way of encoding the full name. We put in the query part of the action URL of the HTML form, but apparently HTML forms with a `GET` type will ignore the query part (replacing it with any input values), which makes sense but doesn't do what we want here. There are a few sane ways to fix it, but given that the encoding logic we had before for including the name in the URL was ugly, I'm pretty happy with just adding a hidden input to the form for the name.
2019-01-29 21:20:31 +01:00
{% endif %}
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>
</div>
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 %}