From a418bdf51223d58718cc2632314423deee6c50f2 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 20 Jun 2014 17:30:28 +0200 Subject: [PATCH] Update on buttons --- blender-bfct/application/static/assets_shared | 2 +- .../templates/applications/index.html | 6 ++-- .../templates/applications/view.html | 35 +++++++++++-------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/blender-bfct/application/static/assets_shared b/blender-bfct/application/static/assets_shared index a83634e..0ab2954 160000 --- a/blender-bfct/application/static/assets_shared +++ b/blender-bfct/application/static/assets_shared @@ -1 +1 @@ -Subproject commit a83634e5af3185b6123bcc5e8afb5e5d85ba3cb5 +Subproject commit 0ab2954746ce378163d5341bdfd6cd72b9ac8e81 diff --git a/blender-bfct/application/templates/applications/index.html b/blender-bfct/application/templates/applications/index.html index 2712745..52a3e20 100755 --- a/blender-bfct/application/templates/applications/index.html +++ b/blender-bfct/application/templates/applications/index.html @@ -14,7 +14,7 @@ {% for application in applications %} - +
@@ -25,9 +25,9 @@ {{application.pretty_submission_date}} {{application.status}} - {{application.approve}} + {{application.approve}} / - {{application.approve + application.reject}} + {{application.approve + application.reject}} diff --git a/blender-bfct/application/templates/applications/view.html b/blender-bfct/application/templates/applications/view.html index 737d8b9..a82e630 100755 --- a/blender-bfct/application/templates/applications/view.html +++ b/blender-bfct/application/templates/applications/view.html @@ -2,7 +2,7 @@ {% block body %}
-
+ -
+

Status: {{application.status}}

- +
@@ -41,35 +41,40 @@ {% endfor %}
Reviewer
-
+ {% if not review %}
- {% if not review %} +
{% else %}

You {% if review.approved %} approved {% else %} rejected {% endif %} this candidate.

- {% endif %}
-
- {% if current_user.has_role('admin') %} - {% if not application.review_end_date %} + {% endif %} + {% if current_user.has_role('admin') %} + {% if not application.review_end_date %} +

+ - {% endif %} {% endif %} -
+ {% endif %}