diff --git a/hypha/apply/dashboard/templates/dashboard/includes/project_status_bar.html b/hypha/apply/dashboard/templates/dashboard/includes/project_status_bar.html index 47ca9d6e8c..21b49360a9 100644 --- a/hypha/apply/dashboard/templates/dashboard/includes/project_status_bar.html +++ b/hypha/apply/dashboard/templates/dashboard/includes/project_status_bar.html @@ -1,5 +1,5 @@ {% load dashboard_statusbar_tags %} -
+
{% for status, text in statuses %} {% if forloop.counter0 == current_status_index %} {% include "funds/includes/status_bar_item.html" with is_current=True is_complete=False label=text %} @@ -11,8 +11,8 @@ {% endfor %}
-
-
- {{ object.get_status_display }} -
+
+
+ {{ current_status }} +
diff --git a/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html b/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html index 784081f544..b6c293266c 100644 --- a/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html +++ b/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html @@ -2,8 +2,8 @@ {% for project in page.object_list %}
-
-
+
+

{{ project.title }}

{% trans "Project start date: " %} {{ project.created_at.date }}

diff --git a/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html b/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html index a4036589b9..c5b9f454df 100644 --- a/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html +++ b/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html @@ -2,8 +2,8 @@ {% for submission in page.object_list %}
-
-
+
+

{{ submission.title }}

{% if submission.is_draft %} diff --git a/hypha/apply/dashboard/templatetags/dashboard_statusbar_tags.py b/hypha/apply/dashboard/templatetags/dashboard_statusbar_tags.py index c60f8e1f44..4411068c9b 100644 --- a/hypha/apply/dashboard/templatetags/dashboard_statusbar_tags.py +++ b/hypha/apply/dashboard/templatetags/dashboard_statusbar_tags.py @@ -22,5 +22,6 @@ def project_status_bar(current_status, user, author=False, css_class=""): "current_status_index": [status for status, _ in PROJECT_STATUS_CHOICES].index( current_status ), + "current_status": current_status, "class": css_class, } diff --git a/hypha/apply/funds/templates/funds/includes/status_bar.html b/hypha/apply/funds/templates/funds/includes/status_bar.html index beff7c317d..d54e5ab458 100644 --- a/hypha/apply/funds/templates/funds/includes/status_bar.html +++ b/hypha/apply/funds/templates/funds/includes/status_bar.html @@ -14,7 +14,7 @@ {% endifchanged %} {% endfor %}

-
+
{% if public %} {{ current_phase.public_name }}