-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
{% block title %}{{ user.username }}{% endblock %}
{% block heading %}link accounts for {{ user.username }}{% endblock %}
{% block body %}
-{% if confirmation %}
-<p>A confirmation email has been sent to {{ confirmation.email }}.</p>
-
-<p>beta link: <a
- href="{% url patchwork.views.user.link_confirm key=confirmation.key %}"
- >{% url patchwork.views.user.link_confirm key=confirmation.key %}</a></p>
+{% if confirmation and not error %}
+<p>A confirmation email has been sent to {{ confirmation.email }}. Click
+on the link provided in the email to confirm that this address belongs to
+you.</p>
{% else %}
<p>There was an error submitting your link request.</p>
{{ form.non_field_errors }}
{% endif %}
+ {% if error %}
+ <ul class="errorlist"><li>{{error}}</li></ul>
+ {% endif %}
- <form action="{% url patchwork.views.user.link %}" method="post">
+ <form action="{% url 'patchwork.views.user.link' %}" method="post">
+ {% csrf_token %}
{{linkform.email.errors}}
Link an email address: {{ linkform.email }}
</form>