+
Change Password
- {% if form.errors %}
-
- {{ form.non_field_errors }}
-
- {% endif %}
+ {% if form.errors %}
+
+ {{ form.non_field_errors }}
+
+ {% endif %}
-
+
{% endblock %}
diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html
index ca0151f..46cbcaf 100644
--- a/templates/account/password_reset.html
+++ b/templates/account/password_reset.html
@@ -1,31 +1,36 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
{% load i18n %}
{% block title %}Reset Password{% endblock %}
{% block content %}
-
+
+
Reset Password
+
Enter your email address and we'll send you a link to reset your password.
-
Enter your email address and we'll send you a link to reset your password.
+ {% if form.errors %}
+
+ {{ form.non_field_errors }}
+
+ {% endif %}
- {% if form.errors %}
-
- {{ form.non_field_errors }}
-
- {% endif %}
+
-
-
-
- Back to Login
-
+
{% endblock %}
diff --git a/templates/account/password_reset_done.html b/templates/account/password_reset_done.html
index f6d4a71..2e9b1ef 100644
--- a/templates/account/password_reset_done.html
+++ b/templates/account/password_reset_done.html
@@ -1,22 +1,27 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
{% load i18n %}
{% block title %}Password Reset Email Sent{% endblock %}
{% block content %}
-
Email Sent
+
+
+
+
+
+
Email Sent
+
+ We've sent you an email with instructions on how to reset your password.
+ Please check your inbox and follow the link in the email.
+
+
+ Note: If you don't see the email, please check your spam folder.
+
-
- We've sent you an email with instructions on how to reset your password.
- Please check your inbox and follow the link in the email.
-
-
-
- Note: If you don't see the email, please check your spam folder.
-
-
-
- Back to Login
-
+
+ Back to Login
+
+
+
{% endblock %}
diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html
index 308b693..fcedf5a 100644
--- a/templates/account/password_reset_from_key.html
+++ b/templates/account/password_reset_from_key.html
@@ -1,32 +1,38 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
{% load i18n %}
{% block title %}Set New Password{% endblock %}
{% block content %}
-
Set New Password
+
+
+
Set New Password
- {% if token_fail %}
-
- This password reset link is invalid or has expired.
- Please request a new one.
-
- {% else %}
- {% if form.errors %}
-
- {{ form.non_field_errors }}
-
- {% endif %}
+ {% if token_fail %}
+
+
This password reset link is invalid or has expired.
+
Request a new one
+
+ {% else %}
+ {% if form.errors %}
+
+ {{ form.non_field_errors }}
+
+ {% endif %}
-
- {% endif %}
+
+ {% endif %}
+
+
{% endblock %}
diff --git a/templates/account/password_reset_from_key_done.html b/templates/account/password_reset_from_key_done.html
index 5dd1400..28fad03 100644
--- a/templates/account/password_reset_from_key_done.html
+++ b/templates/account/password_reset_from_key_done.html
@@ -1,15 +1,21 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
{% load i18n %}
{% block title %}Password Reset Complete{% endblock %}
{% block content %}
-
Password Reset Complete
+
+
+
+
+
+
Password Reset Complete
+
Your password has been successfully reset. You can now log in with your new password.
-
Your password has been successfully reset. You can now log in with your new password.
-
-
- Log In
-
+
+ Log In
+
+
+
{% endblock %}
diff --git a/templates/account/signup.html b/templates/account/signup.html
index 818d25c..42a3aef 100644
--- a/templates/account/signup.html
+++ b/templates/account/signup.html
@@ -1,29 +1,36 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
{% load i18n %}
{% block title %}Sign Up{% endblock %}
{% block content %}
-
Sign Up
+
+
+
Sign Up
- {% if form.errors %}
-
- {{ form.non_field_errors }}
-
- {% endif %}
+ {% if form.errors %}
+
+ {{ form.non_field_errors }}
+
+ {% endif %}
-
+
-
- Already have an account? Log in
-
+
+ Already have an account?
+ Log in
+
+
+
{% endblock %}
diff --git a/templates/applicant-allocations.html b/templates/applicant-allocations.html
index bcf270b..81dae53 100644
--- a/templates/applicant-allocations.html
+++ b/templates/applicant-allocations.html
@@ -3,38 +3,39 @@
{% block title %}Allocations for {{ applicant }} - {{ program }}{% endblock %}
{% block content %}
-
-
-
Allocations for {{ applicant }}
+
+
+
Allocations for {{ applicant }}
-
-
- | Resource |
- Amount |
- |
-
- {% for allocation in allocations %}
-
- | {{ allocation.resource }} |
- {{ allocation.amount }} |
-
- |
-
- {% empty %}
-
- | No allocations. |
-
- {% endfor %}
-
-
Allocate resource
-
- {% include "_form.html" %}
-
+
+ {% endfor %}
+
+ {% else %}
+
No allocations yet.
+ {% endif %}
+
+
+
+
Allocate Resource
+ {% include "_form.html" with submit_verb="Allocate" %}
{% endblock %}
diff --git a/templates/applicant-view.html b/templates/applicant-view.html
index aa82817..f865f5b 100644
--- a/templates/applicant-view.html
+++ b/templates/applicant-view.html
@@ -3,60 +3,84 @@
{% block title %}{{ applicant.name }} - {{ program }}{% endblock %}
{% block content %}
-
-
-
{{ applicant.name }}
+
+
+
+
+
+
{{ applicant.name }}
-
Email address
-
{{ applicant.email }}
+
+
+
Email
+
{{ applicant.email }}
+
+
+
Applied
+
{{ applicant.applied|date:"j M Y, P" }}
+
+
-
Application time
-
{{ applicant.applied|date:"j M Y P" }}
+ {% for question in questions %}
+
+
{{ question.question }}
+ {% if question.answer %}
+
{{ question.answer.answer }}
+ {% else %}
+
Not answered
+ {% endif %}
+
+ {% endfor %}
+
- {% for question in questions %}
-
{{ question.question }}
- {% if question.answer %}
-
- {{ question.answer.answer|linebreaksbr }}
+
+
+
Scores
+
+ {% if not all_scores %}
+
+ You must score this applicant before you can see other scores.
{% else %}
-
- Not answered.
-
+
+
+
+
+ | User |
+ Score |
+ Comment |
+
+
+
+ {% for ascore in all_scores %}
+
+ | {{ ascore.user }} |
+
+
+ {{ ascore.score|floatformat:"1" }}
+
+ |
+
+ {{ ascore.comment }}
+ {% if ascore.score_history %}
+ History: {{ ascore.score_history_human }}
+ {% endif %}
+ |
+
+ {% endfor %}
+
+
+
{% endif %}
- {% endfor %}
-
-
Scores
- {% if not all_scores %}
-
- You must score this applicant before you can see other scores.
-
- {% else %}
-
-
- | User |
- Score |
- Comment |
-
- {% for ascore in all_scores %}
-
- | {{ ascore.user }} |
- {{ ascore.score|floatformat:"1" }} |
-
- {{ ascore.comment }}
- {% if ascore.score_history %}
- Score history: {{ ascore.score_history_human }}
- {% endif %}
- |
-
- {% endfor %}
-
- {% endif %}
+
+
-
Submit score
-
+
+
+
+
Submit Score
{% include "_form.html" with submit_verb="Save" include_random=1 %}
-
+
{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index c32ed9b..f1b8529 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,92 +1,119 @@
{% load static %}
-
+
{% block whole_title %}{% block title %}{% endblock %} - Grorg{% endblock %}
-
-
+
-
{% block extra_head %}{% endblock %}
-
+
{% block edit_bar %}{% endblock %}
-