Merge pull request #3025 from HyphaApp/enhancement/spell_out_submissions_for_review

Improving table titles on dashboard and overview

hypha/apply/dashboard/templates/dashboard/dashboard.html

@@ -61,7 +61,7 @@
     </div>
 
     <div id="submissions-awaiting-review" class="wrapper wrapper--bottom-space">
-        {% include "dashboard/includes/waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
+        {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
     </div>
 
     {% if my_flagged.table.data %}

hypha/apply/dashboard/templates/dashboard/includes/waiting-for-review.html → hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <h4 class="heading heading--normal">
-    {% trans "Waiting for your review" %} <span class="heading heading--submission-count">{{ in_review_count }}</span>
+    {% trans "Submissions waiting for your review" %} <span class="heading heading--submission-count">{{ in_review_count }}</span>
 </h4>
 
 {% if my_review.data %}

hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html

@@ -20,7 +20,7 @@
 <div class="wrapper wrapper--large wrapper--inner-space-medium">
 
     <div class="wrapper wrapper--bottom-space">
-        {% include "dashboard/includes/waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
+        {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
     </div>
 
     {% if my_flagged.table.data %}

hypha/apply/dashboard/tests/test_views.py

@@ -82,7 +82,7 @@ class TestStaffDashboard(BaseViewTestCase):
     def test_waiting_for_review_with_count(self):
         submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[self.user])
         response = self.get_page()
-        self.assertContains(response, 'Waiting for your review')
+        self.assertContains(response, 'Submissions waiting for your review')
         self.assertContains(response, submission.title)
         self.assertEqual(response.context['awaiting_reviews']['count'], 1)
 
@@ -92,7 +92,7 @@ class TestStaffDashboard(BaseViewTestCase):
         review = ReviewFactory(submission=submission, author__reviewer=staff, author__staff=True, recommendation_yes=True)
         ReviewOpinionFactory(review=review, author__reviewer=self.user, opinion_agree=True)
         response = self.get_page()
-        self.assertContains(response, 'Waiting for your review')
+        self.assertContains(response, 'Submissions waiting for your review')
         self.assertContains(response, "Nice! You're all caught up.")
         self.assertEqual(response.context['awaiting_reviews']['count'], 0)
 
@@ -167,7 +167,7 @@ class TestReviewerDashboard(BaseViewTestCase):
     def test_waiting_for_review_with_count(self):
         submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[self.user])
         response = self.get_page()
-        self.assertContains(response, 'Waiting for your review')
+        self.assertContains(response, 'Submissions waiting for your review')
         self.assertContains(response, submission.title)
         self.assertEqual(response.context['in_review_count'], 1)
 

hypha/apply/funds/templates/funds/submissions_awaiting_review.html

@@ -2,13 +2,13 @@
 {% load i18n static %}
 {% load render_table from django_tables2 %}
 
-{% block title %}{% trans "Awaiting Review" %}{% endblock %}
+{% block title %}{% trans "Submissions awaiting Review" %}{% endblock %}
 {% block content %}
 <div class="admin-bar">
     <div class="admin-bar__inner wrapper--search">
         {% block page_header %}
             <div>
-                <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Waiting for your Review" %}<span class="submissions-count"> ({{ table.rows|length }})</span></h1>
+                <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Submissions waiting for your review" %}<span class="submissions-count"> ({{ table.rows|length }})</span></h1>
             </div>
         {% endblock %}
     </div>