From e2223f670225754b1a93e098170468b79a2a493f Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sun, 4 Dec 2011 19:23:25 +0000 Subject: [PATCH] Final cleanup, formset was actually supposed to be fieldset. --- app/eve_api/templates/eve_api/add.html | 4 +- app/eve_api/templates/eve_api/update.html | 4 +- .../templates/groups/create_request.html | 4 +- app/groups/templates/groups/group_list.html | 41 +++++++++---------- app/hr/templates/hr/applications/accept.html | 4 +- app/hr/templates/hr/applications/add.html | 4 +- .../hr/applications/add_message.html | 5 +-- .../templates/hr/applications/add_note.html | 4 +- app/hr/templates/hr/applications/reject.html | 4 +- app/hr/templates/hr/blacklist_add.html | 4 +- app/hr/templates/hr/recommendations/add.html | 4 +- app/reddit/templates/reddit/add.html | 4 +- app/sso/templates/sso/apipassword.html | 4 +- app/sso/templates/sso/lookup/userlookup.html | 4 +- .../registration/activation_complete.html | 3 ++ app/templates/registration/login.html | 34 ++++++--------- .../registration/password_change_form.html | 16 +++++--- .../registration/password_reset_complete.html | 3 ++ .../registration/password_reset_done.html | 8 ++-- .../registration/password_reset_form.html | 18 ++++---- .../registration/registration_form.html | 13 +++--- 21 files changed, 97 insertions(+), 92 deletions(-) diff --git a/app/eve_api/templates/eve_api/add.html b/app/eve_api/templates/eve_api/add.html index 6faa219..9b847d7 100644 --- a/app/eve_api/templates/eve_api/add.html +++ b/app/eve_api/templates/eve_api/add.html @@ -11,7 +11,7 @@
- +
{% include "formtools/formfield.html" with field=form.api_user_id %} {% include "formtools/formfield.html" with field=form.api_key class="xxlarge"%} @@ -19,7 +19,7 @@ {% csrf_token %} - +
{% endblock %} diff --git a/app/eve_api/templates/eve_api/update.html b/app/eve_api/templates/eve_api/update.html index 671b8eb..ed5ce05 100644 --- a/app/eve_api/templates/eve_api/update.html +++ b/app/eve_api/templates/eve_api/update.html @@ -10,7 +10,7 @@

Please update your API key as provided on the EVE Online API page and a optional description.

- +
{% include "formtools/formfield.html" with field=form.api_user_id %} {% include "formtools/formfield.html" with field=form.api_key class="xxlarge" %} @@ -18,7 +18,7 @@ {% csrf_token %} - +
{% endblock %} diff --git a/app/groups/templates/groups/create_request.html b/app/groups/templates/groups/create_request.html index 75ed1f0..138c572 100644 --- a/app/groups/templates/groups/create_request.html +++ b/app/groups/templates/groups/create_request.html @@ -10,10 +10,10 @@

Please fill in a reason why you like to be a member of this group and any supporting evidence as requested by the group adminship

- +
{% include "formtools/formfield.html" with field=form.reason class="xxlarge" %} {% csrf_token %} - +
{% endblock %} diff --git a/app/groups/templates/groups/group_list.html b/app/groups/templates/groups/group_list.html index 1e8a4ca..2d7aa75 100644 --- a/app/groups/templates/groups/group_list.html +++ b/app/groups/templates/groups/group_list.html @@ -8,6 +8,26 @@

This is the list of your current groups, and groups you can request to be a member of.

+{% if group_list %} + + + + + + {% for id, group, description, status, requestable, fixed, pending, moderated in group_list %} + + + + + + {% endfor %} + +
Group NameDescriptionStatusActions
{{ group }}{{ description }}{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}{% ifequal status None %}{% if requestable %}{% if moderated %}Request Membership{% else %}Join{% endif %}{% endif %}{% endifequal %} + {% if not fixed and status %}Leave {% endif %} + {% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}Admin{% endif %}{% endif %}
+{% else %} +No groups are available. +{% endif %} - -{% if group_list %} - - - - -{% for id, group, description, status, requestable, fixed, pending, moderated in group_list %} - - - - - -{% endfor %} - -
Group NameDescriptionStatusActions
{{ group }}{{ description }}{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}{% ifequal status None %}{% if requestable %}{% if moderated %}Request Membership{% else %}Join{% endif %}{% endif %}{% endifequal %} - {% if not fixed and status %}Leave {% endif %} - {% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}Admin{% endif %}{% endif %}
-{% else %} -No groups are available. -{% endif %} - {% endblock %} diff --git a/app/hr/templates/hr/applications/accept.html b/app/hr/templates/hr/applications/accept.html index abbb0b6..5291746 100644 --- a/app/hr/templates/hr/applications/accept.html +++ b/app/hr/templates/hr/applications/accept.html @@ -10,12 +10,12 @@

Fill in a note you want to send to the user.

- +
{% include "formtools/formfield.html" with field=form.text class="xxlarge" %} {% include "formtools/formfield.html" with field=form.template %} {% csrf_token %} - +
{% endblock %} diff --git a/app/hr/templates/hr/applications/add.html b/app/hr/templates/hr/applications/add.html index c3f740e..e8ea6ba 100644 --- a/app/hr/templates/hr/applications/add.html +++ b/app/hr/templates/hr/applications/add.html @@ -11,12 +11,12 @@

Select the character you wish to apply with, then the corporation you wish to apply for.

- +
{% include "formtools/formfield.html" with field=form.character %} {% include "formtools/formfield.html" with field=form.corporation %} {% csrf_token %} - +
{% endblock %} diff --git a/app/hr/templates/hr/applications/add_message.html b/app/hr/templates/hr/applications/add_message.html index 039ed1f..cf2730c 100644 --- a/app/hr/templates/hr/applications/add_message.html +++ b/app/hr/templates/hr/applications/add_message.html @@ -8,12 +8,11 @@
- - +
{% include "formtools/formfield.html" with field=form.text class="xxlarge" %} {% if form.template %}{% include "formtools/formfield.html" with field=form.template %}{% endif %} {% csrf_token %} - +
{% endblock %} diff --git a/app/hr/templates/hr/applications/add_note.html b/app/hr/templates/hr/applications/add_note.html index 97dbbd2..d936a83 100644 --- a/app/hr/templates/hr/applications/add_note.html +++ b/app/hr/templates/hr/applications/add_note.html @@ -8,10 +8,10 @@
- +
{% include "formtools/formfield.html" with field=form.text class="xxlarge" %} {% csrf_token %} - +
{% endblock %} diff --git a/app/hr/templates/hr/applications/reject.html b/app/hr/templates/hr/applications/reject.html index 83ecc81..8ff87fd 100644 --- a/app/hr/templates/hr/applications/reject.html +++ b/app/hr/templates/hr/applications/reject.html @@ -10,12 +10,12 @@

Fill in the rejection reason below, please note, this will be sent out to the user.

- +
{% include "formtools/formfield.html" with field=form.text class="xxlarge" %} {% include "formtools/formfield.html" with field=form.template %} {% csrf_token %} - +
diff --git a/app/hr/templates/hr/blacklist_add.html b/app/hr/templates/hr/blacklist_add.html index 65f4bda..f7de5bb 100644 --- a/app/hr/templates/hr/blacklist_add.html +++ b/app/hr/templates/hr/blacklist_add.html @@ -7,7 +7,7 @@
- +
{% include "formtools/formfield.html" with field=form.type %} {% include "formtools/formfield.html" with field=form.value class="xxlarge" %} {% include "formtools/formfield.html" with field=form.reason class="xxlarge" %} @@ -15,7 +15,7 @@ {% csrf_token %} - +
{% endblock %} diff --git a/app/hr/templates/hr/recommendations/add.html b/app/hr/templates/hr/recommendations/add.html index 4c7c6e2..c80092c 100644 --- a/app/hr/templates/hr/recommendations/add.html +++ b/app/hr/templates/hr/recommendations/add.html @@ -13,11 +13,11 @@ The person you are recommending needs to have created their application before you can add a recommendation.

- +
{% include "formtools/formfield.html" with field=form.character %} {% include "formtools/formfield.html" with field=form.application %} {% csrf_token %} - +
{% endblock %} diff --git a/app/reddit/templates/reddit/add.html b/app/reddit/templates/reddit/add.html index 127ebb1..f17173d 100644 --- a/app/reddit/templates/reddit/add.html +++ b/app/reddit/templates/reddit/add.html @@ -13,10 +13,10 @@ corporation

on from time to time

- +
{% include "formtools/formfield.html" with field=form.username %} {% csrf_token %} - +
{% endblock %} diff --git a/app/sso/templates/sso/apipassword.html b/app/sso/templates/sso/apipassword.html index 3865f96..af45c5b 100644 --- a/app/sso/templates/sso/apipassword.html +++ b/app/sso/templates/sso/apipassword.html @@ -12,11 +12,11 @@ password below.

- +
{% include "formtools/formfield.html" with field=form.password %} {% csrf_token %} - +
{% endblock %} diff --git a/app/sso/templates/sso/lookup/userlookup.html b/app/sso/templates/sso/lookup/userlookup.html index 8f8577a..4a54b4a 100644 --- a/app/sso/templates/sso/lookup/userlookup.html +++ b/app/sso/templates/sso/lookup/userlookup.html @@ -10,7 +10,7 @@

- +
{% csrf_token %}
{{ form.type.label_tag }} @@ -25,7 +25,7 @@
- +

{% endblock %} diff --git a/app/templates/registration/activation_complete.html b/app/templates/registration/activation_complete.html index e1848f8..9b93b04 100644 --- a/app/templates/registration/activation_complete.html +++ b/app/templates/registration/activation_complete.html @@ -1,6 +1,9 @@ {% extends "registration/registration_base.html" %} {% block title %}Activation complete{% endblock %} {% block content %} +
+

Activation Complete

+

Thanks, activation complete! You may now login using the username and password you set at registration.

{% endblock %} diff --git a/app/templates/registration/login.html b/app/templates/registration/login.html index 666b982..3d93dbb 100644 --- a/app/templates/registration/login.html +++ b/app/templates/registration/login.html @@ -15,30 +15,20 @@
-
- {{ form.username.label_tag }} -
- {{ form.username }} -
-
-
- {{ form.password.label_tag }} -
- {{ form.password }} -
-
+ {% include "formtools/formfield.html" with field=form.username %} + {% include "formtools/formfield.html" with field=form.password %} -
-
- Forgotten Password - Create Account -
-
- -
+
+
+ Forgotten Password + Create Account
- - {% csrf_token %} +
+ +
+
+ + {% csrf_token %}
diff --git a/app/templates/registration/password_change_form.html b/app/templates/registration/password_change_form.html index 9a0648a..c8a5309 100644 --- a/app/templates/registration/password_change_form.html +++ b/app/templates/registration/password_change_form.html @@ -1,11 +1,17 @@ {% extends "registration/registration_base.html" %} {% block title %}Change password{% endblock %} {% block content %} +
+

Change Password

+
+
- - {{ form }} -
- -{% csrf_token %} +
+ {% include "formtools/formfield.html" with field=form.old_password %} + {% include "formtools/formfield.html" with field=form.new_password1 %} + {% include "formtools/formfield.html" with field=form.new_password2 %} + {% csrf_token %} + +
{% endblock %} diff --git a/app/templates/registration/password_reset_complete.html b/app/templates/registration/password_reset_complete.html index 25b40da..beb255a 100644 --- a/app/templates/registration/password_reset_complete.html +++ b/app/templates/registration/password_reset_complete.html @@ -1,5 +1,8 @@ {% extends "registration/registration_base.html" %} {% block title %}Password reset complete{% endblock %} {% block content %} +
+

Password Reset Complete

+

Your password has been reset! You may now log in.

{% endblock %} diff --git a/app/templates/registration/password_reset_done.html b/app/templates/registration/password_reset_done.html index 47a8c49..51207b1 100644 --- a/app/templates/registration/password_reset_done.html +++ b/app/templates/registration/password_reset_done.html @@ -1,8 +1,8 @@ {% extends "registration/registration_base.html" %} {% block title %}Password reset{% endblock %} {% block content %} -

-We have sent you an email with a link to reset your password. Please check -your email and click the link to continue. -

+
+

Password Reset

+
+

We have sent you an email with a link to reset your password. Please check your email and click the link to continue.

{% endblock %} diff --git a/app/templates/registration/password_reset_form.html b/app/templates/registration/password_reset_form.html index 723f773..299544e 100644 --- a/app/templates/registration/password_reset_form.html +++ b/app/templates/registration/password_reset_form.html @@ -1,13 +1,15 @@ {% extends "registration/registration_base.html" %} -{% block title %}Reset password{% endblock %} +{% block title %}Forgotten password{% endblock %} {% block content %} -

Forgot your password? Enter your email in the form below and we'll send you -instructions for creating a new one.

+
+

Forgotten Password

+
+

Forgot your password? Enter your email in the form below and we'll send you instructions for creating a new one.

- - {{ form }} -
- -{% csrf_token %} +
+ {% include "formtools/formfield.html" with field=form.email %} + {% csrf_token %} + +
{% endblock %} diff --git a/app/templates/registration/registration_form.html b/app/templates/registration/registration_form.html index 04eeba0..123b194 100644 --- a/app/templates/registration/registration_form.html +++ b/app/templates/registration/registration_form.html @@ -13,10 +13,13 @@

In addition, some providers maybe blocked form auth due to their draconian spam detection routines, which has flagged this server numerous times for no reason. These include AT&T services, Cox, and a few other mainland US ISPs. If you have a Google Mail account please consider using that instead of your ISP email account.

- - {{ form }} -
- {% csrf_token %} - +
+ {% include "formtools/formfield.html" with field=form.username %} + {% include "formtools/formfield.html" with field=form.email %} + {% include "formtools/formfield.html" with field=form.password1 %} + {% include "formtools/formfield.html" with field=form.password2 %} + {% csrf_token %} + +
{% endblock %}