diff --git a/opentech/apply/dashboard/templates/dashboard/dashboard.html b/opentech/apply/dashboard/templates/dashboard/dashboard.html index 350a7f3f58f294030f65e9368a7d6d57dda36230..fb2eb89a045372b5eb22c429f805313c1988a921 100644 --- a/opentech/apply/dashboard/templates/dashboard/dashboard.html +++ b/opentech/apply/dashboard/templates/dashboard/dashboard.html @@ -21,31 +21,11 @@ </div> </div> <div class="wrapper wrapper--large wrapper--inner-space-medium"> - <div class="wrapper wrapper--large wrapper--inner-space-medium"> - <h4 class="heading heading--normal"> - Waiting for your review <span class="heading heading--submission-count">{{ in_review_count }}</span> - </h4> + <div> - {% if my_review.data %} - {% render_table my_review %} + {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more %} - {% if display_more %} - <div class="all-submissions-table__more"> - <a href="{% url 'apply:submissions:list' %}?reviewers={{ request.user.pk }}">Show all</a> - </div> - {% endif %} - - {% else %} - <div class="grid wrapper wrapper--large "> - <div class="reviewer-dash-box"> - <h5 class="reviewer-dash-box__title">Nice! You're all caught up.</h5> - <a class="button button--primary" href="{% url 'apply:submissions:list' %}">Find new applications to review</a> - </div> - {# TODO Fill in data and update styles in future ticket #} - <div>{# Since you last logged in #}</div> - </div> - {% endif %} {% if closed_rounds or open_rounds %} {% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds title=rounds_title %} @@ -53,7 +33,7 @@ </div> - <div class="wrapper wrapper--large wrapper--inner-space-medium"> + <div> {% if my_reviewed.data %} <h4 class="heading heading--normal"> diff --git a/opentech/apply/dashboard/templates/dashboard/includes/waiting-for-review.html b/opentech/apply/dashboard/templates/dashboard/includes/waiting-for-review.html new file mode 100644 index 0000000000000000000000000000000000000000..2caf8fb815c2ca670ab3f1a8e652163105d7d215 --- /dev/null +++ b/opentech/apply/dashboard/templates/dashboard/includes/waiting-for-review.html @@ -0,0 +1,24 @@ +{% load render_table from django_tables2 %} + +<h4 class="heading heading--normal"> + Waiting for your review <span class="heading heading--submission-count">{{ in_review_count }}</span> +</h4> + +{% if my_review.data %} + {% render_table my_review %} + + {% if display_more %} + <div class="all-submissions-table__more"> + <a href="{% url 'apply:submissions:list' %}?reviewers={{ request.user.pk }}">Show all</a> + </div> + {% endif %} + +{% else %} + <div class="reviewer-dash-box"> + <h5 class="reviewer-dash-box__title">Nice! You're all caught up.</h5> + <a class="button button--primary" href="{% url 'apply:submissions:list' %}">Find new applications to review</a> + </div> + {# TODO Fill in data and update styles in future ticket #} + <div>{# Since you last logged in #}</div> + +{% endif %} \ No newline at end of file diff --git a/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html index 20d0d17ca1141c2011e5c323a6d445115d0a9ee0..a9497f496a7e5a14babbf1e3e98b61e5df246d3c 100644 --- a/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html +++ b/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html @@ -18,37 +18,14 @@ </div> <div class="wrapper wrapper--large wrapper--inner-space-medium"> - <div class="wrapper wrapper--large wrapper--inner-space-medium"> - <h4 class="heading heading--normal"> - Waiting for your review <span class="heading heading--submission-count">{{ in_review_count }}</span> - </h4> + <div> - {% if my_review.data %} - {% render_table my_review %} + {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more %} - {% if display_more %} - <div class="all-submissions-table__more"> - <a href="{% url 'apply:submissions:list' %}">Show all</a> - </div> - {% endif %} - - {% else %} - <div class="grid wrapper wrapper--large "> - <div class="reviewer-dash-box"> - <h5 class="reviewer-dash-box__title">Nice! You're all caught up.</h5> - <a class="button button--primary" href="{% url 'apply:submissions:list' %}">Find new applications to review</a> - </div> - {# TODO Fill in data and update styles in future ticket #} - <div>{# Since you last logged in #}</div> - </div> - {% endif %} </div> -</div> - -<div class="wrapper wrapper--large wrapper--inner-space-medium"> - <div class="wrapper wrapper--large wrapper--inner-space-medium"> + <div> {% if my_reviewed.data %} <h4 class="heading heading--normal">