diff --git a/common/activities.py b/common/activities.py index d47dcbc6a..0146b40da 100644 --- a/common/activities.py +++ b/common/activities.py @@ -84,7 +84,7 @@ def activity_from_data_request_project(project, user=None): "label": project.id_label, "name": project.name, "url": "direct-sharing/images/badge.png", - "href": reverse("activity-management", kwargs={"source": project.slug}), + "href": reverse("activity", kwargs={"slug": project.slug}), }, "source_name": project.id_label, "project": project, diff --git a/common/tasks.py b/common/tasks.py index ba66e5f2f..563a74295 100644 --- a/common/tasks.py +++ b/common/tasks.py @@ -37,7 +37,7 @@ def send_emails(project_id, project_members, subject, message, all_members=False "project": project.name, "username": project_member.member.user.username, "activity_management_url": full_url( - reverse("activity-management", kwargs={"source": project.slug}) + reverse("activity", kwargs={"slug": project.slug}) ), "project_message_form": full_url( reverse("activity-messaging", kwargs={"source": project.slug}) diff --git a/data_import/templates/data_import/datatypes-detail.html b/data_import/templates/data_import/datatypes-detail.html index d7c8baf44..f27c97772 100644 --- a/data_import/templates/data_import/datatypes-detail.html +++ b/data_import/templates/data_import/datatypes-detail.html @@ -45,7 +45,7 @@

{{ object.description }}

{% if object.source_projects.all %} {% endif %} diff --git a/open_humans/templates/member/activity.html b/open_humans/templates/member/activity.html new file mode 100644 index 000000000..6a74becde --- /dev/null +++ b/open_humans/templates/member/activity.html @@ -0,0 +1,59 @@ +{% extends 'base-bs4.html' %} +{% load static %} +{% load utilities %} + +{% block head_title %}{{ project.name }}{% endblock %} + +{% block meta_description %}"{{ project.name }}" on Open Humans: {{ project.long_description }}{% endblock meta_description %} + +{% block main %} +
+
+
+

{{ project.name }}

+ {% include 'partials/activity-info-short-bs4.html' %} +
+
+
+ +
+
+
+

{{ project.name }}

+
+
+ {% include 'partials/activity-info-short-bs4.html' %} +
+
+
+ +
+
+

About {{ project.name }}

+

{{ project.long_description|markdown }}

+ +
+
+ {% include 'partials/activity-panel-info.html' %} +
+
+ {% include 'partials/activity-panel-data.html' %} +
+
+{% endblock main %} diff --git a/open_humans/templates/member/my-member-joined.html b/open_humans/templates/member/my-member-joined.html index 55b956ca1..66349cde1 100644 --- a/open_humans/templates/member/my-member-joined.html +++ b/open_humans/templates/member/my-member-joined.html @@ -22,7 +22,7 @@

Current projects

  • {{ project.name }}
    @@ -43,7 +43,7 @@

    Past projects

  • {{ project.name }}
    diff --git a/open_humans/templates/pages/data-processing-activities.html b/open_humans/templates/pages/data-processing-activities.html index 685dc85cd..cc4eccb08 100644 --- a/open_humans/templates/pages/data-processing-activities.html +++ b/open_humans/templates/pages/data-processing-activities.html @@ -116,7 +116,7 @@

    Project data

    Categories of data recipients

    @@ -141,13 +141,13 @@

    Projects