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

Fix styling for confirmation error links. 

This converts our confirmation error links to match the nicer visual
style of our configuration error and 404 pages.

Fixes #7193.
This commit is contained in:
Utkarsh Patil 2018-02-28 02:22:03 +05:30 committed by Tim Abbott
parent 2787ae01f5
commit 2e6b65ac22
5 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
static/images/timeout_hourglass.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

5
static/styles/portico.css
View File

@ -1747,6 +1747,11 @@ input.new-organization-button {
line-height: normal;
}
.hourglass-img {
width: initial !important;
margin-bottom: 25px !important;
}
@media (max-width: 1000px) {
.app.help .markdown {
width: calc(100vw - 50px);

22
templates/confirmation/link_does_not_exist.html
View File

@ -1,17 +1,15 @@
{% extends "zerver/portico.html" %}
{% block portico_content %}
<div class="pitch">
<hr/>
<p class="lead">Whoops. We couldn't find your confirmation link in the system.</p>
<p>
Anyway, shoot us a line at
<a href="mailto:{{ support_email }}">{{ support_email }}</a>
and we'll get this resolved shortly.
</p>
<div class="error_page">
<div class="container">
<img src="/static/images/400art.svg" alt=""/>
<div class="errorbox">
<div class="errorcontent">
<h1 class="lead">Whoops. We couldn't find your confirmation link in the system.</h1>
<p>Anyway, shoot us a line at <a href="mailto:{{ support_email }}">{{ support_email }}</a> and we'll get this resolved shortly.</p>
</div>
</div>
</div>
</div>
{% endblock %}

22
templates/confirmation/link_expired.html
View File

@ -1,15 +1,17 @@
{% extends "zerver/portico.html" %}
{% block portico_content %}
<div class="pitch">
<hr/>
<p class="lead">Whoops. The confirmation link has expired or been deactivated.</p>
<p>
Please contact your organization administrator for a new one.
</p>
<div class="error_page">
<div class="container">
<div class="row-fluid">
<img class="hourglass-img" src="/static/images/timeout_hourglass.png" alt=""/>
<div class="errorbox">
<div class="errorcontent">
<h1 class="lead">Whoops. The confirmation link has expired or been deactivated.</h1>
<p>Please contact your organization administrator for a new one.</p>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

26
templates/confirmation/link_malformed.html
View File

@ -1,20 +1,16 @@
{% extends "zerver/portico.html" %}
{% block portico_content %}
<div class="pitch">
<hr/>
<p class="lead">Whoops. The confirmation link is malformed.</p>
<p>Make sure you copied the link correctly in to your browser. If you're
still encountering this page, it's probably our fault. We're sorry.</p>
<p>
Anyway, shoot us a line at
<a href="mailto:{{ support_email }}">{{ support_email }}</a>
and we'll get this resolved shortly.
</p>
<div class="error_page">
<div class="container">
<img src="/static/images/500art.svg" alt=""/>
<div class="errorbox">
<div class="errorcontent">
<h1 class="lead">Whoops. The confirmation link is malformed.</h1>
<p>Make sure you copied the link correctly in to your browser. If you're still encountering this page, it's probably our fault. We're sorry.</p>
<p>Anyway, shoot us a line at <a href="mailto:{{ support_email }}">{{ support_email }}</a> and we'll get this resolved shortly.</p>
</div>
</div>
</div>
</div>
{% endblock %}