Dear {{ researcher_name }},
You have been given {{ permission }} permissions to collaborate on {{ study_name }}.
- Here is a link to start collaborating. + Here is a link to start collaborating.
Best, diff --git a/accounts/templates/emails/notify_researcher_of_study_permissions.txt b/accounts/templates/emails/notify_researcher_of_study_permissions.txt index 3e9638791..bb371b309 100644 --- a/accounts/templates/emails/notify_researcher_of_study_permissions.txt +++ b/accounts/templates/emails/notify_researcher_of_study_permissions.txt @@ -2,7 +2,7 @@ Dear {{ researcher_name }}, You have been given {{ permission }} permissions to collaborate on {{ study_name }}. -Here is a link to start collaborating: {{ base_url }}{% url 'exp:study-detail' study_id %}. +Here is a link to start collaborating: {{ base_url }}{% url 'exp:study' study_id %}. Best, {{ lab_name }} Admin diff --git a/accounts/tests/test_accounts.py b/accounts/tests/test_accounts.py index 58d06dffc..0dffe071d 100644 --- a/accounts/tests/test_accounts.py +++ b/accounts/tests/test_accounts.py @@ -106,7 +106,7 @@ def setUp(self): reverse("exp:participant-detail", kwargs={"pk": self.participant.pk}), reverse("exp:study-participant-analytics"), reverse("exp:study-create"), - reverse("exp:study-detail", kwargs={"pk": self.study.pk}), + reverse("exp:study", kwargs={"pk": self.study.pk}), reverse("exp:study-participant-contact", kwargs={"pk": self.study.pk}), reverse("exp:study-edit", kwargs={"pk": self.study.pk}), reverse("exp:study-responses-list", kwargs={"pk": self.study.pk}), diff --git a/exp/templates/exp/_navigation.html b/exp/templates/exp/_navigation.html index 7b7351de6..84bc53482 100644 --- a/exp/templates/exp/_navigation.html +++ b/exp/templates/exp/_navigation.html @@ -13,9 +13,7 @@ id="navbarDropdown" role="button" data-bs-toggle="dropdown" - aria-expanded="false"> - Help -
+ aria-expanded="false">Help @@ -123,9 +106,7 @@ title="" id="id_max_age_years"> {% for x, y in form.fields.max_age_years.choices %} - + {% endfor %} @@ -140,10 +121,7 @@ name="max_age_months" title=""> {% for x, y in form.fields.max_age_months.choices %} - + {% endfor %} @@ -158,9 +136,7 @@ name="max_age_days" title=""> {% for x, y in form.fields.max_age_days.choices %} - + {% endfor %} @@ -181,17 +157,4 @@ {% bootstrap_field form.must_not_have_participated label_class="form-label fw-bold" wrapper_class="mb-4" %} {% bootstrap_field form.criteria_expression label_class="form-label fw-bold" wrapper_class="mb-4" %}-
-
-
-
-
-- Now it's time for the actual study! For internal studies, you will add a protocol configuration or generator. For external studies, you will paste in your study or scheduling link. If you don't see what you expect, check the "External" and "Scheduled" checkboxes at the top of this form! -
-{% bootstrap_field form.structure label_class="form-label fw-bold" %}
-{% bootstrap_field form.use_generator label_class="form-label" wrapper_class="form-group" %}
-{{ form.generator.help_text|safe }}
-
- {% bootstrap_field form.generator show_help=False label_class="form-label fw-bold" %}
-
+{% bootstrap_field form.study_type label_class="form-label fw-bold" wrapper_class="mb-4" %}
diff --git a/studies/templates/studies/_study_type.html b/studies/templates/studies/_study_type.html
deleted file mode 100644
index ad9919e5a..000000000
--- a/studies/templates/studies/_study_type.html
+++ /dev/null
@@ -1,100 +0,0 @@
-{% load exp_extras %}
-{% load web_extras %}
-{% load django_bootstrap5 %}
-{% load bootstrap_icons %}
-{% load static %}
-{% button_secondary_classes as btn_secondary_classes %}
-
-
-
diff --git a/studies/templates/studies/experiment_runner/base.html b/studies/templates/studies/experiment_runner/base.html
new file mode 100644
index 000000000..a9d4a0fdc
--- /dev/null
+++ b/studies/templates/studies/experiment_runner/base.html
@@ -0,0 +1,59 @@
+{% extends "exp/base.html" %}
+{% load django_bootstrap5 %}
+{% load bootstrap_icons %}
+{% load web_extras %}
+{% load static %}
+{% block title %}
+ Edit | {{ study.name }}
+{% endblock title %}
+{% block breadcrumb %}
+ {% breadcrumb %}
+ {% url 'exp:study-list' %} Manage Studies
+ {% url 'exp:study' pk=study.id %} {{ study.name }}
+ Edit
+{% endbreadcrumb %}
+{% endblock breadcrumb %}
+{% block content %}
+ {% url 'exp:study' pk=study.pk as url_study_detail %}
+ {% button_secondary_classes as btn_secondary_classes %}
+ {% button_primary_classes as btn_primary_classes %}
+ {% url 'exp:preview-detail' uuid=study.uuid as url_preview_detail %}
+ {% bs_icon "play-circle" as bs_icon_play_circle %}
+ {% bootstrap_form_errors form %}
+
-
-
- {% for study_type in study_types %}
-
-
- {% for field in study_type.configuration.metadata.fields %}
- {% with field.name as key %}
- {% with field.value as value %}
- {% with key_help_text|get_key:key|default:"" as help_text %}
- {% if field.input_type == "checkbox" %}
-
- {% endfor %}
-
-
-
-
- {% elif field.input_type == "radio" %}
-
-
- {% for option in field.options %}
-
- {% else %}
-
- {% endif %}
- {% if key == "last_known_player_sha" %}
-
-
-
- {% if option == "Other" %}
- {% if study %}
- {% with "other_"|add:field.name as other_field %}
- {% with study.metadata|get_key:other_field|default:'' as other_value %}
-
- {% endwith %}
- {% endwith %}
- {% else %}
-
- {% endif %}
- {% endif %}
- {% endfor %}
- {{ help_text }}
-
-
-
-
- About this version
-
-
-
-
- About this version
-
- {% bootstrap_button "Check for updates" button_class=btn_secondary_classes id="update-button" %}
-
-
-
-
- {% endif %}
- {% endwith %}
- {% endwith %}
- {% endwith %}
- {% endfor %}
-
-
-
- Update info
-
+
+{% endblock content %}
diff --git a/studies/templates/studies/experiment_runner/efp_edit.html b/studies/templates/studies/experiment_runner/efp_edit.html
new file mode 100644
index 000000000..bf78096bf
--- /dev/null
+++ b/studies/templates/studies/experiment_runner/efp_edit.html
@@ -0,0 +1,72 @@
+{% extends "studies/experiment_runner/base.html" %}
+{% load django_bootstrap5 %}
+{% load web_extras %}
+{% load static %}
+{% block head %}
+ {{ block.super }}
+ {% comment %} ace editor fix cannot be defered {% endcomment %}
+
+ {% comment %} {% endcomment %}
+
+ {{ form.media }}
+{% endblock head %}
+{% block header %}
+
+
+
+
+ Study Details
+
+
+
+ Study Details
+
+ {% bootstrap_button bs_icon_play_circle|add:"Preview Study" href=url_preview_detail button_class=btn_secondary_classes %}
+
+
+
+
+ + We have split the study forms into two views for easier navigation. + You can update eligibility and other recruiting information on + the Study Ad + and Recruitment page. +
+ {% block header %} + {% endblock header %} + ++ You have created a Lookit/Ember Frameplayer study. If you need to change study types, + please create a new study instead. +
+{% endblock header %} +{% block form %} + {% bootstrap_form form %} +
+
+
+
+ About this version
+
+
+
+
+ About this version
+
+ {% button_secondary_classes as btn_secondary_classes %}
+ {% bootstrap_button "Check for updates" button_class=btn_secondary_classes id="update-button" %}
+
+
+
+
+{% endblock form %}
diff --git a/studies/templates/studies/experiment_runner/external_edit.html b/studies/templates/studies/experiment_runner/external_edit.html
new file mode 100644
index 000000000..65aad0b9c
--- /dev/null
+++ b/studies/templates/studies/experiment_runner/external_edit.html
@@ -0,0 +1,17 @@
+{% extends "studies/experiment_runner/base.html" %}
+{% load django_bootstrap5 %}
+{% load static %}
+{% load web_extras %}
+{% block head %}
+ {{ block.super }}
+
+{% endblock head %}
+{% block header %}
+
+
+ Update info
+
+
+ + Since the version you are using, there have been updates to the master branch of https://github.com/lookit/ember-lookit-frameplayer. +
+
+
+
+
+ Date
+ Description
+ Commit Sha
+ + You have created an External study. If you need to change study types, + please create a new study instead. +
+{% endblock header %} +{% block form %} + {% bootstrap_form form %} +{% endblock form %} diff --git a/studies/templates/studies/lab_create.html b/studies/templates/studies/lab_create.html index e0a537ba4..b5584a121 100644 --- a/studies/templates/studies/lab_create.html +++ b/studies/templates/studies/lab_create.html @@ -16,7 +16,7 @@ {% csrf_token %} {% bootstrap_form form %} {% form_buttons %} - {% bootstrap_button "Submit" %} - {% endform_buttons %} - + {% bootstrap_button "Submit" %} + {% endform_buttons %} + {% endblock content %} diff --git a/studies/templates/studies/lab_list.html b/studies/templates/studies/lab_list.html index 5642e2d01..b0766996f 100644 --- a/studies/templates/studies/lab_list.html +++ b/studies/templates/studies/lab_list.html @@ -19,30 +19,24 @@ placeholder="Filter by name, PI, or institution" size="50" type="text" - value="{{ match }}"/> - - + value="{{ match }}" /> + +
diff --git a/studies/templates/studies/lab_member_list.html b/studies/templates/studies/lab_member_list.html
index 7c2c4578f..fa24491de 100644
--- a/studies/templates/studies/lab_member_list.html
+++ b/studies/templates/studies/lab_member_list.html
@@ -20,9 +20,9 @@
placeholder="Filter by researcher name"
size="50"
type="text"
- value="{{ match }}"/>
-
-
+ value="{{ match }}" />
+
+
- {% endif %}
-
+ {% bootstrap_button "Submit" %}
+ {% endform_buttons %}
+
+
+ {% endif %}
- {% empty %}
- Researcher Name
@@ -46,48 +46,30 @@
{% form_buttons %}
- {% bootstrap_button "Submit" %}
- {% endform_buttons %}
-
- No researchers found!
- {% endfor %}
- {% include "studies/_paginator.html" with page=lab_members_qs %}
+
+{% empty %}
+ No researchers found!
+{% endfor %}
+{% include "studies/_paginator.html" with page=lab_members_qs %}
{% endblock content %}
diff --git a/studies/templates/studies/lab_update.html b/studies/templates/studies/lab_update.html
index e9f65f3a5..25bb698f1 100644
--- a/studies/templates/studies/lab_update.html
+++ b/studies/templates/studies/lab_update.html
@@ -20,8 +20,8 @@
{% csrf_token %}
{% bootstrap_form form %}
{% form_buttons %}
- {% bootstrap_button "Discard Changes" href=url_lab_edit button_class=btn_secondary_classes %}
- {% bootstrap_button "Save" type="submit" button_class=btn_primary_classes %}
- {% endform_buttons %}
-
+ {% bootstrap_button "Discard Changes" href=url_lab_edit button_class=btn_secondary_classes %}
+ {% bootstrap_button "Save" type="submit" button_class=btn_primary_classes %}
+ {% endform_buttons %}
+
{% endblock content %}
diff --git a/studies/templates/studies/options/recipients.html b/studies/templates/studies/options/recipients.html
index 7a987cdfa..c586c2651 100644
--- a/studies/templates/studies/options/recipients.html
+++ b/studies/templates/studies/options/recipients.html
@@ -5,7 +5,5 @@
{% if person.email_new_studies %}data-new-studies{% endif %}
{% if person.email_study_updates %}data-study-updates{% endif %}
{% if person.email_response_questions %}data-response-questions{% endif %}
- data-transactional-message>
- {{ person.slug }}
-
+ data-transactional-message>{{ person.slug }}
{% endwith %}
diff --git a/studies/templates/studies/study_attachments.html b/studies/templates/studies/study_attachments.html
index 259b4bc0a..273b5de53 100644
--- a/studies/templates/studies/study_attachments.html
+++ b/studies/templates/studies/study_attachments.html
@@ -11,7 +11,7 @@
{% block breadcrumb %}
{% breadcrumb %}
{% url 'exp:study-list' %} Manage Studies
- {% url 'exp:study-detail' pk=study.id %} {{ study.name }}
+ {% url 'exp:study' pk=study.id %} {{ study.name }}
Videos
{% endbreadcrumb %}
{% endblock breadcrumb %}
@@ -45,8 +45,8 @@
name="match"
placeholder="Filter video name"
type="text"
- value="{{ match }}"/>
-
+ value="{{ match }}" />
+
@@ -85,7 +85,7 @@
{{ video.created_at|date:"n/j/Y g:i A"|default:"N/A" }}
Download
+ class="{% button_primary_classes %} btn-sm">Download
Create Study
- + {% bootstrap_button "Cancel" button_class=btn_secondary_classes href=url_cancel %} + {% bootstrap_button bs_icon_plus|add:"Create Study" button_class=btn_primary_classes button_type="submit" id="create-study-button" %} + {% endform_buttons %} + + {% endblock content %} diff --git a/studies/templates/studies/study_detail.html b/studies/templates/studies/study_detail.html index b18e225c4..c3ca8a7f9 100644 --- a/studies/templates/studies/study_detail.html +++ b/studies/templates/studies/study_detail.html @@ -82,14 +82,14 @@ class="form-control" id="study-preview-link" value="{% url 'exp:preview-detail' uuid=study.uuid %}" - aria-describedby="copy-link-button"/> + aria-describedby="copy-link-button" />
+ width="13" />
{% else %}
@@ -109,14 +109,14 @@
class="form-control"
id="private-study-link"
value="{% url 'web:study-detail' study.uuid %}"
- aria-describedby="copy-link-button"/>
+ aria-describedby="copy-link-button" />
+ width="13" />
{% else %}
@@ -130,7 +130,7 @@
method="post"
style="display:none">
{% csrf_token %}
-
+
{% if "read_study__responses(is_preview=True)" in study_perms %}
@@ -139,7 +139,9 @@
{% endif %}
{% if can_edit_study_details %}
{% bs_icon "pencil-square" %} Edit Study
+ href="{% url 'exp:study-edit' pk=study.id %}">{% bs_icon "megaphone-fill" %}Study Ad and Recruitment
+ {% bs_icon "pencil-square" %}Study Details
{% endif %}
{% if "read_study__responses" in study_perms or "read_study__responses(is_preview=True)" in study_perms %}
{% bs_icon "clipboard-check-fill" %} Clone Study
+ onclick="cloneStudy()">{% bs_icon "clipboard-check-fill" %} Clone Study
{% endif %}
diff --git a/studies/templates/studies/study_detail/_manage_researchers.html b/studies/templates/studies/study_detail/_manage_researchers.html
index 65d9db94f..2ce035063 100644
--- a/studies/templates/studies/study_detail/_manage_researchers.html
+++ b/studies/templates/studies/study_detail/_manage_researchers.html
@@ -7,19 +7,17 @@
{% if users_result %}
@@ -31,13 +29,11 @@
Results
Researchers
data-params="{csrfmiddlewaretoken:'{{ csrf_token }}'}" data-id="{{ researcher.user.get_short_name }}" data-pk="{{ researcher.user.id }}" - data-title="Select researcher permissions"> {{ researcher.current_group }} + data-title="Select researcher permissions">{{ researcher.current_group }}
action="{% url 'exp:change-study-status' study.id %}"
method="post">
{% csrf_token %}
-
+
-
+
{% bootstrap_button "Create" button_type="submit" button_class=btn_primary_classes_create %}
@@ -182,9 +182,9 @@ Videos
View
+ class="{% button_primary_classes %} btn-sm">View
Download
+ class="{% button_primary_classes %} btn-sm">Download
{% empty %}
@@ -205,29 +205,21 @@ Videos
{% csrf_token %}
-
+
Download response
Include with response download:
{% include "studies/_data_options.html" with data_options=data_options %}
-
+
{% bootstrap_button "Download response" button_type="submit" button_class=btn_primary_classes name="download-individual-data" %}
@@ -241,30 +233,20 @@ Download response
id="response-summary-{{ forloop.counter }}"
style="display:none">
-
- Response details
-
+ Response details
Response Details
-
- Name
-
-
- Value
-
+ Name
+ Value
{% for pair in response.summary %}
-
- {{ pair.name }}
-
-
- {{ pair.value }}
-
+ {{ pair.name }}
+ {{ pair.value }}
{% endfor %}
@@ -275,8 +257,6 @@
{% else %}
-
- No responses with confirmed consent.
-
+ No responses with confirmed consent.
{% endif %}
{% endblock content %}
diff --git a/studies/templates/studies/study_responses_consent_ruling.html b/studies/templates/studies/study_responses_consent_ruling.html
index 707e3e8f2..e5ce5d507 100644
--- a/studies/templates/studies/study_responses_consent_ruling.html
+++ b/studies/templates/studies/study_responses_consent_ruling.html
@@ -12,7 +12,7 @@
{% comment %}
When we upgrade to django 2.x, please convert to json_script. Please see:
https://docs.djangoproject.com/en/2.1/ref/templates/builtins/#json-script
- {% endcomment %}
+{% endcomment %}
{{ response_key_value_store | safe }}
@@ -20,7 +20,7 @@
{% block breadcrumb %}
{% breadcrumb %}
{% url 'exp:study-list' %} Manage Studies
- {% url 'exp:study-detail' pk=study.id %} {{ study.name }}
+ {% url 'exp:study' pk=study.id %} {{ study.name }}
Consent Manager
{% endbreadcrumb %}
{% endblock breadcrumb %}
@@ -38,15 +38,9 @@
name="response-status-filters"
class="form-select w-auto"
aria-label="Filter by repsonse status">
-
-
-
+
+
+
Responses*
@@ -63,7 +57,7 @@
overflow-y: scroll">
{% for response in loaded_responses %}
@@ -82,9 +76,7 @@
type="button"
id="consentJudgementDropdown"
data-bs-toggle="dropdown"
- aria-expanded="false">
- {{ response.current_ruling }}
-
+ aria-expanded="false">{{ response.current_ruling }}
-
+
@@ -182,9 +182,9 @@
Videos
View + class="{% button_primary_classes %} btn-sm">View Download + class="{% button_primary_classes %} btn-sm">Download
-
+
Download response
Include with response download:
{% include "studies/_data_options.html" with data_options=data_options %}
- +
{% bootstrap_button "Download response" button_type="submit" button_class=btn_primary_classes name="download-individual-data" %}
@@ -241,30 +233,20 @@
Download response
id="response-summary-{{ forloop.counter }}" style="display:none">
-
- Response details -
+Response details
| - Name - | -- Value - | +Name | +Value |
|---|---|---|---|
| - {{ pair.name }} - | -- {{ pair.value }} - | +{{ pair.name }} | +{{ pair.value }} |