diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:22:07 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:22:07 +0100 |
| commit | 1b06243dabb7d88a2a89c0f37bd6fa69272a5bfa (patch) | |
| tree | c441b408fa8f12434c17529521221616c5ef4f13 /templates/registration/activate.html | |
| parent | 9972e28a91f5c5631e7c0711caf492152bf6812c (diff) | |
| download | troggle-1b06243dabb7d88a2a89c0f37bd6fa69272a5bfa.tar.gz troggle-1b06243dabb7d88a2a89c0f37bd6fa69272a5bfa.tar.bz2 troggle-1b06243dabb7d88a2a89c0f37bd6fa69272a5bfa.zip | |
[svn] Improve registration system.
Add jquery fade effects and quick search.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8334 by cucc @ 5/10/2009 5:23 AM
Diffstat (limited to 'templates/registration/activate.html')
| -rw-r--r-- | templates/registration/activate.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/templates/registration/activate.html b/templates/registration/activate.html index eb8ec61..ca50e6c 100644 --- a/templates/registration/activate.html +++ b/templates/registration/activate.html @@ -10,11 +10,16 @@ New troggle account registered {% block content %}
+{% if account %}
<p>
-Hello, {{user}}! Your account is now activated. You've also been logged in automatically for your convenience. Use the links in the upper right to control this in the future.
+Hello, {{ account }}! Your account is now activated. Now you can <a href="{%url auth_login%}">log in</a> with the password you chose. Use the links in the upper right to control this in the future.
</p>
<p>
If you have been on the expedition in the past, you already have a profile in the system; <a href={% url profiles_select_profile %}>click here </a> to find it and link it to your account. Otherwise, please <a href={% url profiles_create_profile %}> create yourself a new profile</a>.
</p>
+{% endif %}
+
+The activation key you entered has already been used or was invalid.
+
{% endblock %}
\ No newline at end of file |