paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 21:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

portico: Rename 'find_my_team' to 'find_account'.

Browse Source
This commit is contained in:
Tim Abbott
2017-08-28 14:27:16 -07:00
parent 126171cb76
commit ac0d90e533
9 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/styles/portico-signin.css
View File

@@ -30,7 +30,7 @@ html {
color: #aaa;
}
.find-team-page-container #find_my_team i {
.find-account-page-container #find_account i {
font-size: 0.8em;
}
@@ -122,7 +122,7 @@ html {
font-weight: 400;
}
.app-main.find-team-page-container {
.app-main.find-account-page-container {
width: 456px;
font-weight: 400;
}
@@ -156,7 +156,7 @@ html {
font-size: 19px;
}
.find-team-page-container h3,
.find-account-page-container h3,
.forgot-password-container h3 {
margin-top: 0px;
@@ -836,7 +836,7 @@ button.login-google-button {
.app-main.register-page-container,
.app-main.login-page-container,
.app-main.find-team-page-container,
.app-main.find-account-page-container,
.app-main.forgot-password-container {
display: inline-block;
padding: 20px;

4
static/styles/portico.css
View File

@@ -1663,11 +1663,11 @@ input.new-organization-button {
float: right;
}
#find_my_team .form-control {
#find_account .form-control {
height: 30px;
}
#find_my_team .btn {
#find_account .btn {
height: 40px;
border-radius: 5px;
}

12
templates/zerver/find_my_team.html → templates/zerver/find_account.html
View File

@@ -2,13 +2,13 @@
{% block portico_content %}
<div class="app find-team-page flex full-page">
<div class="app find-account-page flex full-page">
<div class="inline-block new-style">
<div class="lead">
<h1 class="get-started">{{ _("Find your team") }}…</h1>
<h1 class="get-started">{{ _("Find your Zulip accounts") }}…</h1>
</div>
<div class="app-main find-team-page-container white-box">
<div class="app-main find-account-page-container white-box">
{% if emails %}
<div id="results">
<p>
@@ -31,12 +31,12 @@
</div>
{% else %}
<div class="find-team-form">
<div class="find-account-form">
<p>
We will send you an email with the sign-in information for
any Zulip organization(s) associated with the addresses you enter below.
</p>
<form class="form-inline" id="find_my_team" name="email_form"
<form class="form-inline" id="find_account" name="email_form"
action="{{ current_url() }}" method="post">
{{ csrf_input }}
<div class="input-box moving-label horizontal">
@@ -44,7 +44,7 @@
<input type="text" autofocus id="emails" name="emails" required />
<label for="id_username">{{ _('Email addresses') }}</label>
</div>
<button type="submit">{{ _('Find team') }}</button>
<button type="submit">{{ _('Find accounts') }}</button>
</div>
<div><i>{{ form.emails.help_text }}</i></div>
</form>

2
templates/zerver/footer.html
View File

@@ -26,7 +26,7 @@
<ul>
{% if find_team_link_disabled %}
{% else %}
<li><a href="{{ root_domain_uri }}/find_my_team/">{{ _("Find account") }}</a></li>
<li><a href="{{ root_domain_uri }}/find_account/">{{ _("Find account") }}</a></li>
{% endif %}
{% if open_realm_creation %}
<li><a href="{{ root_domain_uri }}/create_realm/">{{ _("New organization") }}</a></li>

2
templates/zerver/landing_nav.html
View File

@@ -41,7 +41,7 @@
{% if find_team_link_disabled %}
{% else %}
<li>
<a class="no-style" href="/find_my_team/">Find Accounts</a>
<a class="no-style" href="/find_account/">Find Accounts</a>
</li>
{% endif %}
</ul>

42
zerver/tests/test_signup.py
View File

@@ -1726,7 +1726,7 @@ class TestLoginPage(ZulipTestCase):
ROOT_SUBDOMAIN_ALIASES=['www']):
result = self.client_get("/en/login/")
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, '/find_my_team/')
self.assertEqual(result.url, '/find_account/')
@patch('django.http.HttpRequest.get_host')
def test_login_page_redirects_for_root_domain(self, mock_get_host):
@@ -1737,7 +1737,7 @@ class TestLoginPage(ZulipTestCase):
ROOT_SUBDOMAIN_ALIASES=['www']):
result = self.client_get("/en/login/")
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, '/find_my_team/')
self.assertEqual(result.url, '/find_account/')
mock_get_host.return_value = 'www.testserver.com'
with self.settings(REALMS_HAVE_SUBDOMAINS=True,
@@ -1746,7 +1746,7 @@ class TestLoginPage(ZulipTestCase):
ROOT_SUBDOMAIN_ALIASES=['test']):
result = self.client_get("/en/login/")
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, '/find_my_team/')
self.assertEqual(result.url, '/find_account/')
@patch('django.http.HttpRequest.get_host')
def test_login_page_works_without_subdomains(self, mock_get_host):
@@ -1764,15 +1764,15 @@ class TestLoginPage(ZulipTestCase):
class TestFindMyTeam(ZulipTestCase):
def test_template(self):
# type: () -> None
result = self.client_get('/find_my_team/')
self.assertIn("Find your team", result.content.decode('utf8'))
result = self.client_get('/find_account/')
self.assertIn("Find your Zulip accounts", result.content.decode('utf8'))
def test_result(self):
# type: () -> None
result = self.client_post('/find_my_team/',
result = self.client_post('/find_account/',
dict(emails="iago@zulip.com,cordelia@zulip.com"))
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, "/find_my_team/?emails=iago%40zulip.com%2Ccordelia%40zulip.com")
self.assertEqual(result.url, "/find_account/?emails=iago%40zulip.com%2Ccordelia%40zulip.com")
result = self.client_get(result.url)
content = result.content.decode('utf8')
self.assertIn("Emails sent! You will only receive emails", content)
@@ -1783,10 +1783,10 @@ class TestFindMyTeam(ZulipTestCase):
def test_find_team_ignore_invalid_email(self):
# type: () -> None
result = self.client_post('/find_my_team/',
result = self.client_post('/find_account/',
dict(emails="iago@zulip.com,invalid_email@zulip.com"))
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, "/find_my_team/?emails=iago%40zulip.com%2Cinvalid_email%40zulip.com")
self.assertEqual(result.url, "/find_account/?emails=iago%40zulip.com%2Cinvalid_email%40zulip.com")
result = self.client_get(result.url)
content = result.content.decode('utf8')
self.assertIn("Emails sent! You will only receive emails", content)
@@ -1797,7 +1797,7 @@ class TestFindMyTeam(ZulipTestCase):
def test_find_team_reject_invalid_email(self):
# type: () -> None
result = self.client_post('/find_my_team/',
result = self.client_post('/find_account/',
dict(emails="invalid_string"))
self.assertEqual(result.status_code, 200)
self.assertIn(b"Enter a valid email", result.content)
@@ -1805,13 +1805,13 @@ class TestFindMyTeam(ZulipTestCase):
self.assertEqual(len(outbox), 0)
# Just for coverage on perhaps-unnecessary validation code.
result = self.client_get('/find_my_team/?emails=invalid')
result = self.client_get('/find_account/?emails=invalid')
self.assertEqual(result.status_code, 200)
def test_find_team_zero_emails(self):
# type: () -> None
data = {'emails': ''}
result = self.client_post('/find_my_team/', data)
result = self.client_post('/find_account/', data)
self.assertIn('This field is required', result.content.decode('utf8'))
self.assertEqual(result.status_code, 200)
from django.core.mail import outbox
@@ -1820,9 +1820,9 @@ class TestFindMyTeam(ZulipTestCase):
def test_find_team_one_email(self):
# type: () -> None
data = {'emails': self.example_email("hamlet")}
result = self.client_post('/find_my_team/', data)
result = self.client_post('/find_account/', data)
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, '/find_my_team/?emails=hamlet%40zulip.com')
self.assertEqual(result.url, '/find_account/?emails=hamlet%40zulip.com')
from django.core.mail import outbox
self.assertEqual(len(outbox), 1)
@@ -1830,9 +1830,9 @@ class TestFindMyTeam(ZulipTestCase):
# type: () -> None
do_deactivate_user(self.example_user("hamlet"))
data = {'emails': self.example_email("hamlet")}
result = self.client_post('/find_my_team/', data)
result = self.client_post('/find_account/', data)
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, '/find_my_team/?emails=hamlet%40zulip.com')
self.assertEqual(result.url, '/find_account/?emails=hamlet%40zulip.com')
from django.core.mail import outbox
self.assertEqual(len(outbox), 0)
@@ -1840,25 +1840,25 @@ class TestFindMyTeam(ZulipTestCase):
# type: () -> None
do_deactivate_realm(get_realm("zulip"))
data = {'emails': self.example_email("hamlet")}
result = self.client_post('/find_my_team/', data)
result = self.client_post('/find_account/', data)
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, '/find_my_team/?emails=hamlet%40zulip.com')
self.assertEqual(result.url, '/find_account/?emails=hamlet%40zulip.com')
from django.core.mail import outbox
self.assertEqual(len(outbox), 0)
def test_find_team_bot_email(self):
# type: () -> None
data = {'emails': self.example_email("webhook_bot")}
result = self.client_post('/find_my_team/', data)
result = self.client_post('/find_account/', data)
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, '/find_my_team/?emails=webhook-bot%40zulip.com')
self.assertEqual(result.url, '/find_account/?emails=webhook-bot%40zulip.com')
from django.core.mail import outbox
self.assertEqual(len(outbox), 0)
def test_find_team_more_than_ten_emails(self):
# type: () -> None
data = {'emails': ','.join(['hamlet-{}@zulip.com'.format(i) for i in range(11)])}
result = self.client_post('/find_my_team/', data)
result = self.client_post('/find_account/', data)
self.assertEqual(result.status_code, 200)
self.assertIn("Please enter at most 10", result.content.decode('utf8'))
from django.core.mail import outbox

2
zerver/views/auth.py
View File

@@ -462,7 +462,7 @@ def login_page(request, **kwargs):
if request.user.is_authenticated:
return HttpResponseRedirect("/")
if is_subdomain_root_or_alias(request) and settings.ROOT_DOMAIN_LANDING_PAGE:
redirect_url = reverse('zerver.views.registration.find_my_team')
redirect_url = reverse('zerver.views.registration.find_account')
return HttpResponseRedirect(redirect_url)
realm = get_realm_from_request(request)

6
zerver/views/registration.py
View File

@@ -387,9 +387,9 @@ def generate_204(request):
# type: (HttpRequest) -> HttpResponse
return HttpResponse(content=None, status=204)
def find_my_team(request):
def find_account(request):
# type: (HttpRequest) -> HttpResponse
url = reverse('zerver.views.registration.find_my_team')
url = reverse('zerver.views.registration.find_account')
emails = [] # type: List[Text]
if request.method == 'POST':
@@ -421,6 +421,6 @@ def find_my_team(request):
pass
return render(request,
'zerver/find_my_team.html',
'zerver/find_account.html',
context={'form': form, 'current_url': lambda: url,
'emails': emails},)

2
zproject/urls.py
View File

@@ -154,7 +154,7 @@ i18n_urls = [
url(r'^for/open-source/$', TemplateView.as_view(template_name='zerver/for-open-source.html')),
url(r'^for/companies/$', TemplateView.as_view(template_name='zerver/for-companies.html')),
url(r'^for/working-groups-and-communities/$', TemplateView.as_view(template_name='zerver/for-working-groups-and-communities.html')),
url(r'^find_my_team/$', zerver.views.registration.find_my_team, name='zerver.views.registration.find_my_team'),
url(r'^find_account/$', zerver.views.registration.find_account, name='zerver.views.registration.find_account'),
# Terms of service and privacy pages.
url(r'^terms/$', TemplateView.as_view(template_name='zerver/terms.html'), name='terms'),