From 0e3f8c536b98f333242b0e7bb52ac46ae9f1f253 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Sat, 21 Jun 2014 00:32:22 +0200 Subject: [PATCH] More work on the view application page --- .../application/static/assets/css/bfct.css | 3 + blender-bfct/application/static/assets_shared | 2 +- .../templates/applications/view.html | 115 +++++++++++++----- 3 files changed, 88 insertions(+), 32 deletions(-) diff --git a/blender-bfct/application/static/assets/css/bfct.css b/blender-bfct/application/static/assets/css/bfct.css index acbc363..a1a23bd 100644 --- a/blender-bfct/application/static/assets/css/bfct.css +++ b/blender-bfct/application/static/assets/css/bfct.css @@ -1,3 +1,6 @@ +@import url(http://fonts.googleapis.com/css?family=Open+Sans); +@import url(http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300); + .application_row { width: 430%; height: 100%; diff --git a/blender-bfct/application/static/assets_shared b/blender-bfct/application/static/assets_shared index 0ab2954..c1b0adf 160000 --- a/blender-bfct/application/static/assets_shared +++ b/blender-bfct/application/static/assets_shared @@ -1 +1 @@ -Subproject commit 0ab2954746ce378163d5341bdfd6cd72b9ac8e81 +Subproject commit c1b0adf34cf1cadd1e270e05e12d074ef7280d96 diff --git a/blender-bfct/application/templates/applications/view.html b/blender-bfct/application/templates/applications/view.html index a82e630..fb2bff1 100755 --- a/blender-bfct/application/templates/applications/view.html +++ b/blender-bfct/application/templates/applications/view.html @@ -3,49 +3,107 @@
-

{{application.user.first_name}} {{application.user.last_name}} {{application.city_country}}

+

{{application.user.first_name}} {{application.user.last_name}}

+

{{application.city_country}}

{{application.bio_message}}

+
+ +

+
  • Website: + + {{application.website}} + +
    • +
  • Portfolio: + + {{application.portfolio_cv}} + +
    • +
  • Video Example: + + {{application.video_example}} + +
    • +
  • Written Example: + + {{application.written_example}} + +
    • + +

    +
    -

    Status: {{application.status}}

    +

    Application Status:

    +
    + {% if application.status == 'under_review' %} + +

    Under Review

    + {% elif application.status == 'submitted' %} + +

    Submitted

    + {% else %} + {{application.status}} + {% endif %} + {% if review %} +

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

    +
    + {% endif %}
    - +
    - + - {% for review in reviews%} + {% if reviews %} + {% for review in reviews%} + + + + + {% endfor %} + {% else %} - - + - {% endfor %} + {% endif %}
    ReviewerVoteVerdict
    + {% if review.reviewer.id == current_user.id %} + + {% endif %} + {{review.reviewer.first_name}} {{review.reviewer.last_name}} + {% if review.reviewer.id == current_user.id %} + + {% endif %} + + {% if review.approved %} + + {% else %} + + {% endif %} +
    - {% if review.reviewer.id == current_user.id %} - You - {% endif %} - {{review.reviewer.first_name}} {{review.reviewer.last_name}} - - {% if review.approved %} - √ - {% endif %} + + Tsk tsk! Nobody reviewed this yet.
    +
    {% if not review %} -
    +
    Approve @@ -56,27 +114,22 @@ Reject
    - {% else %} -
    -

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

    -
    -
    +
    {% endif %} +
    {% if current_user.has_role('admin') %} {% if not application.review_end_date %}
    - - Final Approve + Final Approval
    - Final Reject + Final Rejection
    {% endif %} {% endif %}
    - {% endblock %}