From 54b572654261115e3237a3328ef27fb41a822c93 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Thu, 9 Dec 2021 17:07:54 +0100
Subject: [PATCH] list UI: turn title into link where appropriate

---
 .../templates/appointments/resource_list.html |  4 +++-
 .../data_protection/__subject_list.html       |  2 +-
 .../templates/execution/study_detail.html     |  2 +-
 castellum/static/style.css                    |  5 ++++
 .../studies/templates/studies/study_list.html |  8 ++++---
 .../templates/studies/study_sessions.html     |  2 +-
 .../templates/subjects/subject_search.html    | 24 ++++++++++---------
 7 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/castellum/appointments/templates/appointments/resource_list.html b/castellum/appointments/templates/appointments/resource_list.html
index ca2751f86..6131377b5 100644
--- a/castellum/appointments/templates/appointments/resource_list.html
+++ b/castellum/appointments/templates/appointments/resource_list.html
@@ -5,7 +5,9 @@
     <ul class="table-list">
         {% for resource in object_list %}
             <li class="table-list-item">
-                <div class="h4">{{ resource }}</div>
+                <div class="h4">
+                    <a class="unlink" {% if can_manage_resource %}href="{% url 'appointments:resource-detail' resource.pk %}"{% endif %}>{{ resource }}</a>
+                </div>
                 {% is_resource_manager user resource as can_manage_resource %}
                 {% if can_manage_resource %}
                     <div class="table-list-item-actions">
diff --git a/castellum/data_protection/templates/data_protection/__subject_list.html b/castellum/data_protection/templates/data_protection/__subject_list.html
index 603802994..85657a321 100644
--- a/castellum/data_protection/templates/data_protection/__subject_list.html
+++ b/castellum/data_protection/templates/data_protection/__subject_list.html
@@ -5,7 +5,7 @@
         <li class="table-list-item">
             <div>
                 <div>
-                    {{ subject.contact }}
+                    <a class="unlink" href="{% url 'subjects:detail' subject.uuid %}">{{ subject.contact }}</a>
                 </div>
                 {% if subject.due %}
                     <div>
diff --git a/castellum/execution/templates/execution/study_detail.html b/castellum/execution/templates/execution/study_detail.html
index 81077e74c..69a925c83 100644
--- a/castellum/execution/templates/execution/study_detail.html
+++ b/castellum/execution/templates/execution/study_detail.html
@@ -8,7 +8,7 @@
                 {% if can_access %}
                     <div class="d-inline-block my-1 mr-2 {% if participation.dropped_out or participation.subject.blocked or participation.subject.deceased %}text-muted{% endif %}">
                         <div>
-                            {{ participation.subject.contact.full_name }}
+                            <a class="unlink" href="{% url 'execution:participation-detail' study.pk participation.pk %}">{{ participation.subject.contact.full_name }}</a>
                             {% with summary=participation.subject|reliability_summary %}
                                 <span class="d-inline-block my-1 text-{{ participation.subject|reliability_level }}" aria-label="{{ summary }}" title="{{ summary }}">&#9679;</span>
                             {% endwith %}
diff --git a/castellum/static/style.css b/castellum/static/style.css
index e2f32d335..ed97f488c 100644
--- a/castellum/static/style.css
+++ b/castellum/static/style.css
@@ -173,3 +173,8 @@
 input:checked + .checkbox-opacity {
     opacity: 0.5;
 }
+
+.unlink {
+    color: inherit !important;
+    text-decoration: none !important;
+}
diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html
index bf3e55058..3707fcd43 100644
--- a/castellum/studies/templates/studies/study_list.html
+++ b/castellum/studies/templates/studies/study_list.html
@@ -90,15 +90,18 @@
                 <ul class="table-list mb-3">
                     {% for study in object_list %}
                         <li class="table-list-item">
+                            {% has_perm 'studies.access_study' user study as can_access %}
+                            {% has_perm 'studies.view_study' user study as can_view_study %}
                             <div>
-                                <div class="h4 d-inline-block my-1 mr-2">{{ study.name }}</div>
+                                <div class="h4 d-inline-block my-1 mr-2">
+                                    <a class="unlink" {% if can_view_study %}href="{% url 'studies:detail' study.pk %}"{% endif %}>{{ study.name }}</a>
+                                </div>
                                 <div class="d-inline-block my-1 mr-2">{{ study.contact_person }}</div>
                                 {% if study.status == study.FINISHED %}
                                     <span class="badge badge-secondary">{% translate 'Finished' %}</span>
                                 {% endif %}
                             </div>
                             <div class="table-list-item-actions">
-                                {% has_perm 'studies.access_study' user study as can_access %}
                                 {% if can_access and study.status == study.EXECUTION %}
                                     {% has_perm 'recruitment.recruit' user study as can_recruit %}
                                     {% if can_recruit %}
@@ -111,7 +114,6 @@
                                     {% endif %}
                                 {% endif %}
 
-                                {% has_perm 'studies.view_study' user study as can_view_study %}
                                 {% if can_view_study %}
                                     <a class="btn btn-outline-primary my-1" href="{% url 'studies:detail' study.pk %}">{% translate 'Details' %}</a>
                                 {% endif %}
diff --git a/castellum/studies/templates/studies/study_sessions.html b/castellum/studies/templates/studies/study_sessions.html
index 011a39837..2bb56b511 100644
--- a/castellum/studies/templates/studies/study_sessions.html
+++ b/castellum/studies/templates/studies/study_sessions.html
@@ -14,7 +14,7 @@
         {% for session in sessions %}
             <li class="table-list-item">
                 <div class="h4 d-inline-block my-1 mr-2">
-                    {{ session.name }}
+                    <a class="unlink" href="{% url 'studies:session-update' study.pk session.pk %}">{{ session.name }}</a>
                 </div>
                 <span class="my-1 mr-2">{{ session.duration }}{% translate 'min' %}</span>
                 {% for type in session.type.all %}
diff --git a/castellum/subjects/templates/subjects/subject_search.html b/castellum/subjects/templates/subjects/subject_search.html
index 199e6462d..5aca206d2 100644
--- a/castellum/subjects/templates/subjects/subject_search.html
+++ b/castellum/subjects/templates/subjects/subject_search.html
@@ -50,17 +50,19 @@
                                     <div>
                                         {% if can_access %}
                                             <div class="h4 d-inline-block my-1 mr-2">
-                                                {% if contact.title %}{{ contact.title }}{% endif %}
-                                                {% if contact.first_name|lower == form.cleaned_data.first_name|lower %}
-                                                    <mark>{{ contact.first_name }}</mark>
-                                                {% else %}
-                                                    {{ contact.first_name }}
-                                                {% endif %}
-                                                {% if contact.last_name|lower == form.cleaned_data.last_name|lower %}
-                                                    <mark>{{ contact.last_name }}</mark>
-                                                {% else %}
-                                                    {{ contact.last_name }}
-                                                {% endif %}
+                                                <a class="unlink" {% if can_access %}href="{% url 'subjects:detail' subject.uuid %}"{% endif %}>
+                                                    {% if contact.title %}{{ contact.title }}{% endif %}
+                                                    {% if contact.first_name|lower == form.cleaned_data.first_name|lower %}
+                                                        <mark>{{ contact.first_name }}</mark>
+                                                    {% else %}
+                                                        {{ contact.first_name }}
+                                                    {% endif %}
+                                                    {% if contact.last_name|lower == form.cleaned_data.last_name|lower %}
+                                                        <mark>{{ contact.last_name }}</mark>
+                                                    {% else %}
+                                                        {{ contact.last_name }}
+                                                    {% endif %}
+                                                </a>
                                             </div>
                                             {% if can_view_subject %}
                                                 <div class="d-inline-block">
-- 
GitLab