X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=templates%2Fpatchwork%2Fuser-link.html;h=2ed193efe26ece9dc6378aede1f4516a461982a9;hb=e3fadcd6476158e57577a0b4ab69e33b0824ae6d;hp=3eeb527392279669e50b01f1918636a36ff4f931;hpb=c561ebe710d6e6a43aa4afc6c2036a215378ce87;p=patchwork

diff --git a/templates/patchwork/user-link.html b/templates/patchwork/user-link.html
index 3eeb527..2ed193e 100644
--- a/templates/patchwork/user-link.html
+++ b/templates/patchwork/user-link.html
@@ -1,4 +1,4 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}{{ user.username }}{% endblock %}
 {% block heading %}link accounts for {{ user.username }}{% endblock %}
@@ -6,12 +6,10 @@
 
 {% 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 %}
 
@@ -19,6 +17,9 @@
    <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">
     {{linkform.email.errors}}