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 | |
| 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')
| -rw-r--r-- | templates/registration/activate.html | 7 | ||||
| -rw-r--r-- | templates/registration/activation_email.txt | 4 | ||||
| -rw-r--r-- | templates/registration/registration_complete.html | 8 |
3 files changed, 12 insertions, 7 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 diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt index 163e313..20aad5f 100644 --- a/templates/registration/activation_email.txt +++ b/templates/registration/activation_email.txt @@ -1,10 +1,10 @@ -Hello,
+Hello {{ form.user }},
Glad you're joining the CUCC EXPO team! Please go to
{{ site }}{% url registration_activate activation_key %}
-to activate your account. Do this within {{ expiration_days }}, or else you'll have to sign up again.
+to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.
Yours,
The magical troggle
\ No newline at end of file diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html index 552fa04..78684fe 100644 --- a/templates/registration/registration_complete.html +++ b/templates/registration/registration_complete.html @@ -1,13 +1,13 @@ {% extends "base.html" %}
{% block title %}
-registration_complete.html | {{ block.super }}
+{{ block.super }}: registration complete
{% endblock %}
-{% block header %}
-<h1>registration_complete.html</h1>
+{% block contentheader %}
+<h1>Registration Complete</h1>
{% endblock %}
{% block content %}
-Thank you for signing up. An email with the activation code has been sent to your inbox.
+<p>Thank you for signing up. An email with the activation code has been sent to your inbox. </p>
{% endblock %}
\ No newline at end of file |