From 7fe2e3af52310cf3f3f078bba70e27391d8461f0 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sun, 4 Dec 2011 17:51:47 +0000 Subject: [PATCH] Updated hr templates --- app/hr/templates/hr/applications/accept.html | 17 ++++++++++++----- app/hr/templates/hr/applications/add.html | 12 +++++++----- .../templates/hr/applications/add_message.html | 16 +++++++++++----- app/hr/templates/hr/applications/add_note.html | 14 +++++++++----- app/hr/templates/hr/applications/reject.html | 18 +++++++++++++----- app/hr/templates/hr/blacklist_add.html | 13 ++++++++----- app/hr/templates/hr/recommendations/add.html | 11 ++++++----- .../hr/recommendations/view_list.html | 4 ++++ 8 files changed, 70 insertions(+), 35 deletions(-) diff --git a/app/hr/templates/hr/applications/accept.html b/app/hr/templates/hr/applications/accept.html index c5a1622..abbb0b6 100644 --- a/app/hr/templates/hr/applications/accept.html +++ b/app/hr/templates/hr/applications/accept.html @@ -3,12 +3,19 @@ {% block title %}Accept Application{% endblock %} {% block content %} + + +

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

- -{{ form.as_table }} -{% csrf_token %} -
- + + {% 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 51e8156..c3f740e 100644 --- a/app/hr/templates/hr/applications/add.html +++ b/app/hr/templates/hr/applications/add.html @@ -11,10 +11,12 @@

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

- -{{ form.as_table }} -
-{% csrf_token %} - + + {% 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 fd26c74..039ed1f 100644 --- a/app/hr/templates/hr/applications/add_message.html +++ b/app/hr/templates/hr/applications/add_message.html @@ -3,11 +3,17 @@ {% block title %}Send Message to Applicant{% endblock %} {% block content %} + +
- -{{ form.as_table }} -
-{% csrf_token %} - + + + {% 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 436cca3..97dbbd2 100644 --- a/app/hr/templates/hr/applications/add_note.html +++ b/app/hr/templates/hr/applications/add_note.html @@ -3,11 +3,15 @@ {% block title %}Add Note to Application{% endblock %} {% block content %} + +
- -{{ form.as_table }} -
-{% csrf_token %} - + + {% 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 a76f184..83ecc81 100644 --- a/app/hr/templates/hr/applications/reject.html +++ b/app/hr/templates/hr/applications/reject.html @@ -3,12 +3,20 @@ {% block title %}Reject Application{% endblock %} {% block content %} + +

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

- -{{ form.as_table }} -
-{% csrf_token %} - + + + {% 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/blacklist_add.html b/app/hr/templates/hr/blacklist_add.html index f7e173c..65f4bda 100644 --- a/app/hr/templates/hr/blacklist_add.html +++ b/app/hr/templates/hr/blacklist_add.html @@ -7,12 +7,15 @@
- - {{ form.as_table }} -
-{% csrf_token %} + + {% 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" %} + {% include "formtools/formfield.html" with field=form.expiry_date %} - + {% csrf_token %} + +
{% endblock %} diff --git a/app/hr/templates/hr/recommendations/add.html b/app/hr/templates/hr/recommendations/add.html index 87ecaf7..4c7c6e2 100644 --- a/app/hr/templates/hr/recommendations/add.html +++ b/app/hr/templates/hr/recommendations/add.html @@ -13,10 +13,11 @@ The person you are recommending needs to have created their application before you can add a recommendation.

- -{{ form.as_table }} -
-{% csrf_token %} - + + {% include "formtools/formfield.html" with field=form.character %} + {% include "formtools/formfield.html" with field=form.application %} + {% csrf_token %} + +
{% endblock %} diff --git a/app/hr/templates/hr/recommendations/view_list.html b/app/hr/templates/hr/recommendations/view_list.html index 659b0b6..022bb22 100644 --- a/app/hr/templates/hr/recommendations/view_list.html +++ b/app/hr/templates/hr/recommendations/view_list.html @@ -5,6 +5,10 @@ {% block content %} + +

This list shows your current open recommendations that are yet to be submitted, as soon as the recommended user submits their application your recommendation will be removed from this list.

{% if recommendations %}