diff --git a/opentech/apply/dashboard/templates/dashboard/dashboard.html b/opentech/apply/dashboard/templates/dashboard/dashboard.html index 535b01f95de65c62eec5e79c42c293ed9778c8d8..bc4cb7267c30131a12365bd051dfe40326452656 100644 --- a/opentech/apply/dashboard/templates/dashboard/dashboard.html +++ b/opentech/apply/dashboard/templates/dashboard/dashboard.html @@ -22,36 +22,27 @@ </div> <div class="wrapper wrapper--large wrapper--inner-space-medium"> - <div> - - {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more %} - - - {% if closed_rounds or open_rounds %} - {% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds title=rounds_title %} - {% endif %} - - </div> - - <div> - {% if my_reviewed.data %} + <div class="wrapper wrapper--bottom-space"> + {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more %} + </div> - <h4 class="heading heading--normal"> - Your previous reviews - </h4> + {% if closed_rounds or open_rounds %} + {% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds title=rounds_title %} + {% endif %} - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True %} - {% render_table my_reviewed %} + {% if my_reviewed.data %} + <div class="wrapper wrapper--bottom-space"> - {% if display_more_reviewed %} - <div class="all-submissions-table__more"> - <a href="{% url 'apply:submissions:list' %}?reviewers={{ request.user.pk }}">Show all</a> - </div> - {% endif %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True use_batch_actions=False heading="Your previous reviews" %} + {% render_table my_reviewed %} + {% if display_more_reviewed %} + <div class="all-submissions-table__more"> + <a href="{% url 'apply:submissions:list' %}?reviewers={{ request.user.pk }}">Show all</a> + </div> {% endif %} </div> - + {% endif %} </div> {% endblock %} diff --git a/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html index cbbbce4ea416cb9a6d8a0ec44defea4ac28ec9c0..e1fc625c7101653efe990e4984457848aaadba12 100644 --- a/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html +++ b/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html @@ -19,20 +19,13 @@ <div class="wrapper wrapper--large wrapper--inner-space-medium"> - <div> - + <div class="wrapper wrapper--bottom-space"> {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more %} - </div> - <div> + <div class="wrapper wrapper--bottom-space"> {% if my_reviewed.data %} - - <h4 class="heading heading--normal"> - Your previous reviews - </h4> - - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True use_batch_actions=False heading="Your previous reviews" %} {% render_table my_reviewed %} {% if display_more_reviewed %}