diff --git a/scipost/templates/partials/scipost/contributor_assignments_as_td.html b/scipost/templates/partials/scipost/contributor_assignments_as_td.html
index 4c1c7c6b15d03e8425fa16586cf4248ef502ca3a..888e41f1b79f7bb3d0d72332813aacedcb070e47 100644
--- a/scipost/templates/partials/scipost/contributor_assignments_as_td.html
+++ b/scipost/templates/partials/scipost/contributor_assignments_as_td.html
@@ -1,9 +1,10 @@
{% load scipost_extras %}
<td>
- {% for expertise in contributor.expertises %}
- {{expertise|get_specialization_display}}<br>
- {% endfor %}
+ {% for expertise in contributor.expertises %}
+ {{ expertise|get_specialization_display }}
+ {% if not forloop.last %}<br>{% endif %}
+ {% endfor %}
</td>
<td>{{contributor.editorial_assignments.ongoing.count}}</td>
diff --git a/scipost/templates/partials/scipost/notification_center_modal.html b/scipost/templates/partials/scipost/notification_center_modal.html
index e2102d5c937d1898c32fedfbd4c2161c224f92ed..de268c868d4715eeab4d9e0ced2518517a5b80bc 100644
--- a/scipost/templates/partials/scipost/notification_center_modal.html
+++ b/scipost/templates/partials/scipost/notification_center_modal.html
@@ -5,11 +5,11 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header border-0 pt-3">
- {% if request.user.contributor %}
- <h4 class="modal-title">{{ request.user.contributor.get_title_display }} {{ request.user.first_name }} {{ request.user.last_name }}</h4>
- {% else %}
- <h4 class="modal-title">{{ request.user }}</h4>
- {% endif %}
+ {% if request.user.contributor %}
+ <h4 class="modal-title">{{ request.user.contributor.get_title_display }} {{ request.user.first_name }} {{ request.user.last_name }}</h4>
+ {% else %}
+ <h4 class="modal-title">{{ request.user }}</h4>
+ {% endif %}
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
@@ -17,36 +17,36 @@
<div class="modal-body pb-2">
</div>
<div class="modal-header">
- <h4 class="modal-title">Inbox</h4>
+ <h4 class="modal-title">Inbox</h4>
</div>
<div class="modal-body p-2 px-md-3">
- <ul class="list-unstyled notifications" id="notifications-list">
- <div style="display: none;" class="template">
- <li class="{unread} item" data-refresh=1>
- <div>
- <div>
- <strong>{actor}</strong>
- <span>{verb}</span>
- </div>
- <div class="mt-1">
- <span class="text-muted">{timesince}</span>
- ·
- <a href="{forward_link}">See item page →</a>
- </div>
- </div>
- <div class="actions">
- <!-- <a href="javascript:;" class="mark-toggle show-unread" data-slug="{slug}"><i class="fa fa-circle" data-toggle="tooltip" data-placement="auto" title="Mark as read" aria-hidden="true"></i></a> -->
+ <ul class="list-unstyled notifications" id="notifications-list">
+ <div style="display: none;" class="template">
+ <li class="{unread} item" data-refresh=1>
+ <div>
+ <div>
+ <strong>{actor}</strong>
+ <span>{verb}</span>
+ </div>
+ <div class="mt-1">
+ <span class="text-muted">{timesince}</span>
+ ·
+ <a href="{forward_link}">See item page →</a>
+ </div>
+ </div>
+ <div class="actions">
+ <!-- <a href="javascript:;" class="mark-toggle show-unread" data-slug="{slug}"><i class="fa fa-circle" data-toggle="tooltip" data-placement="auto" title="Mark as read" aria-hidden="true"></i></a> -->
<!-- <a href="javascript:;" class="mark-toggle show-read" data-slug="{slug}"><i class="fa fa-circle-o" data-toggle="tooltip" data-placement="auto" title="Mark as unread" aria-hidden="true"></i></a> -->
- <a href="{forward_link}" data-toggle='tooltip' data-placement="auto" title="Go to item"><i class="fa fa-share" aria-hidden="true"></i></a>
- </div>
- </li>
+ <a href="{forward_link}" data-toggle='tooltip' data-placement="auto" title="Go to item"><i class="fa fa-share" aria-hidden="true"></i></a>
</div>
- </ul>
+ </li>
+ </div>
+ </ul>
- <p class="text-center loading-link" id="load-notifications">
- <a href="javascript:;">Load more...</a>
- <i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw" id="#loading-notifications"></i>
- </p>
+ <p class="text-center loading-link" id="load-notifications">
+ <a href="javascript:;">Load more...</a>
+ <i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw" id="#loading-notifications"></i>
+ </p>
</div>
<div class="modal-footer py-2">
<button type="button" class="btn btn-link" data-dismiss="modal">Close</button>
diff --git a/scipost/templates/partials/scipost/personal_page/account.html b/scipost/templates/partials/scipost/personal_page/account.html
index 90ecd584eb61a8d8bb5848fae59eb9d14a43e43c..b122d87adda63770bd2ec6ffdb981fa5cc533700 100644
--- a/scipost/templates/partials/scipost/personal_page/account.html
+++ b/scipost/templates/partials/scipost/personal_page/account.html
@@ -2,162 +2,174 @@
{% load user_groups %}
{# Save all Permission groups into template variables #}
- {% is_edcol_admin request.user as is_edcol_admin %}
- {% is_scipost_admin request.user as is_scipost_admin %}
- {% is_editorial_college request.user as is_editorial_college %}
- {% is_advisory_board request.user as is_advisory_board %}
- {% is_vetting_editor request.user as is_vetting_editor %}
- {% is_ambassador request.user as is_ambassador %}
- {% is_junior_ambassador request.user as is_junior_ambassador %}
- {% is_registered_contributor request.user as is_registered_contributor %}
- {% is_tester request.user as is_tester %}
- {% is_production_officer request.user as is_production_officer %}
- {% recommend_new_totp_device request.user as recommend_totp %}
+ {% is_edcol_admin request.user as is_edcol_admin %}
+ {% is_scipost_admin request.user as is_scipost_admin %}
+ {% is_editorial_college request.user as is_editorial_college %}
+ {% is_advisory_board request.user as is_advisory_board %}
+ {% is_vetting_editor request.user as is_vetting_editor %}
+ {% is_ambassador request.user as is_ambassador %}
+ {% is_junior_ambassador request.user as is_junior_ambassador %}
+ {% is_registered_contributor request.user as is_registered_contributor %}
+ {% is_tester request.user as is_tester %}
+ {% is_production_officer request.user as is_production_officer %}
+ {% recommend_new_totp_device request.user as recommend_totp %}
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title mb-0">Your Account</h2>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Your Account</h2>
+ </div>
</div>
+ </div>
</div>
-<div class="row">
- <div class="col-md-6">
- <h3>Your personal details:</h3>
- {% include "scipost/_private_info_as_table.html" with contributor=contributor %}
-
- {% if contributor %}
- {# Scientist fields #}
- <h3 class="mt-3">Your main discipline:</h3>
- <ul><li>{{ contributor.get_discipline_display }}</li></ul>
-
- <h3 class="mt-3">Your expertises:</h3>
- {% if contributor.expertises %}
- {% include "scipost/_expertises_as_ul.html" with contributor=contributor %}
- {% else %}
- <p>You haven't listed your expertise(s).<br/>
- Do so by <a href="{% url 'scipost:update_personal_data' %}">updating your personal data</a>
- </p>
- {% endif %}
- {# END: Scientist fields #}
- {% endif %}
- </div>
- <div class="col-md-6">
- {% if contributor %}
- {# Scientist fields #}
- {% if not contributor.is_currently_available %}
- <h3 class="text-warning">You are currently unavailable</h3>
- <p>Check your availability underneath if this should not be the case.</p>
- <hr>
- {% endif %}
- {# END: Scientist fields #}
- {% endif %}
-
- {% if recommend_totp %}
- <div class="border border-danger p-2 mb-3">
- <h3>
- <i class="fa fa-exclamation-triangle text-danger"></i>
- Please increase your account's security</h3>
- <div>
- Your account grants access to sensitive, confidential information. Therefore we strongly recommend to use two factor authentication that adds an extra layer of protection to your SciPost account.
-
- <br><br>
- <a href="{% url 'scipost:totp_create' %}">Set up two factor authentication here</a>.
- </div>
- </div>
- {% endif %}
-
- <div class="border border-danger p-2">
- <h3 class="text-danger">Scientists, please help us out!</h3>
- <p class="mb-1">If it is not listed on our <a href="{% url 'sponsors:sponsors' %}" target="_blank">Sponsors page</a>, please encourage your institution (through a librarian, director, ...) to join. You can use this email <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'sponsors/sponsor_petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">template</a>.</p>
- </div>
- <hr>
- {% if is_scipost_admin %}
- <h3>You are a SciPost Administrator.</h3>
- {% endif %}
- {% if is_edcol_admin %}
- <h3>You are a SciPost Editorial Administrator.</h3>
- {% endif %}
- {% if is_advisory_board %}
- <h3>You are a member of the Advisory Board.</h3>
- {% endif %}
- {% if is_editorial_college %}
- <h3>You are a member of the Editorial College.</h3>
- {% endif %}
- {% if is_vetting_editor %}
- <h3>You are a SciPost Vetting Editor.</h3>
- {% endif %}
- {% if is_registered_contributor %}
- <h3>You are a Registered Contributor.</h3>
- {% endif %}
- {% if is_tester %}
- <h3>You are a SciPost Tester.</h3>
- {% endif %}
- {% if is_ambassador %}
- <h3>You are a SciPost Ambassador.</h3>
- {% endif %}
- {% if is_junior_ambassador %}
- <h3>You are a SciPost Junior Ambassador.</h3>
- {% endif %}
- {% if is_production_officer %}
- <h3>You are a SciPost Production Officer.</h3>
+<div class="row">
+ <div class="col-md-6">
+ <h3>Your personal details:</h3>
+ {% include "scipost/_private_info_as_table.html" with contributor=contributor %}
+
+ {% if contributor %}
+ {# Scientist fields #}
+ <h3 class="mt-3">Your main discipline:</h3>
+ <ul><li>{{ contributor.get_discipline_display }}</li></ul>
+
+ <h3 class="mt-3">Your expertises:</h3>
+ {% if contributor.expertises %}
+ {% include "scipost/_expertises_as_ul.html" with contributor=contributor %}
+ {% else %}
+ <p>You haven't listed your expertise(s).<br/>
+ Do so by <a href="{% url 'scipost:update_personal_data' %}">updating your personal data</a>
+ </p>
{% endif %}
+ {# END: Scientist fields #}
+ {% endif %}
+ </div>
- {% if contributor.fellowships.all %}
- <h3>Your Fellowships:</h3>
- <ul class="mb-2">
- {% for fellowship in contributor.fellowships.all %}
- <li class="pt-1">
- {{ fellowship.contributor.get_discipline_display }}
-
- {% if fellowship.guest %}
- (Guest Fellowship)
- <br>
- Your Proceedings:
- <ul>
- {% for proc in fellowship.proceedings.all %}
- <li>{{ proc }}</li>
- {% empty %}
- <li><em>No proceedings assigned yet.</em></li>
- {% endfor %}
- </ul>
- {% else %}
- (Regular Fellowship)
- {% endif %}
-
- {% if not fellowship.is_active %}
- <span class="label label-outline-warning label-sm">Inactive</span>
- {% endif %}
-
- {% if fellowship.start_date or fellowship.until_date %}
- <div class="text-muted">
- {% if fellowship.start_date %}
- from {{ fellowship.start_date }}
- {% endif %}
-
- {% if fellowship.until_date %}
- until {{ fellowship.until_date }}
- {% endif %}
- </div>
- {% endif %}
- </li>
-
- {% endfor %}
- </ul>
- <a href="{% url 'submissions:pool' %}" class="h3 text-primary ml-4 px-3 d-block-inline">Go to the Submissions Pool</a>
+ <div class="col-md-6">
+ {% if contributor %}
+ {# Scientist fields #}
+ {% if not contributor.is_currently_available %}
+ <h3 class="text-warning">You are currently unavailable</h3>
+ <p>Check your availability underneath if this should not be the case.</p>
+ <hr>
{% endif %}
+ {# END: Scientist fields #}
+ {% endif %}
+
+ {% if recommend_totp %}
+ <div class="border border-danger p-2 mb-3">
+ <h3>
+ <i class="fa fa-exclamation-triangle text-danger"></i>
+ Please increase your account's security</h3>
+ <div>
+ Your account grants access to sensitive, confidential information.
+ Therefore we strongly recommend to use two factor authentication, which adds
+ an extra layer of protection to your SciPost account.
+ <br><br>
+ <a href="{% url 'scipost:totp_create' %}">Set up two factor authentication here</a>.
+ </div>
+ </div>
+ {% endif %}
+
+ <div class="border border-danger p-2">
+ <h3 class="text-danger">Scientists, please help us out!</h3>
+ <p class="mb-1">If it is not listed on our
+ <a href="{% url 'sponsors:sponsors' %}" target="_blank">Sponsors page</a>,
+ please encourage your institution (through a librarian, director, ...) to join.
+ You can use this email <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'sponsors/sponsor_petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">template</a>.</p>
+ </div>
+ <hr>
- <h3 class="mt-3">Update your personal data or password</h3>
+ {% if is_scipost_admin %}
+ <h3>You are a SciPost Administrator.</h3>
+ {% endif %}
+
+ {% if is_edcol_admin %}
+ <h3>You are a SciPost Editorial Administrator.</h3>
+ {% endif %}
+
+ {% if is_advisory_board %}
+ <h3>You are a member of the Advisory Board.</h3>
+ {% endif %}
+
+ {% if is_editorial_college %}
+ <h3>You are a member of the Editorial College.</h3>
+ {% endif %}
+
+ {% if is_vetting_editor %}
+ <h3>You are a SciPost Vetting Editor.</h3>
+ {% endif %}
+
+ {% if is_registered_contributor %}
+ <h3>You are a Registered Contributor.</h3>
+ {% endif %}
+
+ {% if is_tester %}
+ <h3>You are a SciPost Tester.</h3>
+ {% endif %}
+
+ {% if is_ambassador %}
+ <h3>You are a SciPost Ambassador.</h3>
+ {% endif %}
+
+ {% if is_junior_ambassador %}
+ <h3>You are a SciPost Junior Ambassador.</h3>
+ {% endif %}
+
+ {% if is_production_officer %}
+ <h3>You are a SciPost Production Officer.</h3>
+ {% endif %}
+
+ {% if contributor.fellowships.all %}
+ <h3>Your Fellowships:</h3>
+ <ul class="mb-2">
+ {% for fellowship in contributor.fellowships.all %}
+ <li class="pt-1">
+ {{ fellowship.contributor.get_discipline_display }}
+
+ {% if fellowship.guest %}
+ (Guest Fellowship)
+ <br>
+ Your Proceedings:
+ <ul>
+ {% for proc in fellowship.proceedings.all %}
+ <li>{{ proc }}</li>
+ {% empty %}
+ <li><em>No proceedings assigned yet.</em></li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ (Regular Fellowship)
+ {% endif %}
+
+ {% if not fellowship.is_active %}
+ <span class="label label-outline-warning label-sm">Inactive</span>
+ {% endif %}
- <ul>
- <li><a href="{% url 'scipost:update_personal_data' %}">Update your personal data</a></li>
- <li><a href="{% url 'scipost:password_change' %}">Change your password</a></li>
- <li><a href="{% url 'scipost:totp' %}">Two factor authentication</a></li>
+ {% if fellowship.start_date or fellowship.until_date %}
+ <div class="text-muted">
+ {% if fellowship.start_date %}
+ from {{ fellowship.start_date }}
+ {% endif %}
+ {% if fellowship.until_date %}
+ until {{ fellowship.until_date }}
+ {% endif %}
+ </div>
+ {% endif %}
+ </li>
+ {% endfor %}
</ul>
- </div>
+ <a href="{% url 'submissions:pool' %}" class="h3 text-primary ml-4 px-3 d-block-inline">Go to the Submissions Pool</a>
+ {% endif %}
+
+ <h3 class="mt-3">Update your personal data or password</h3>
+ <ul>
+ <li><a href="{% url 'scipost:update_personal_data' %}">Update your personal data</a></li>
+ <li><a href="{% url 'scipost:password_change' %}">Change your password</a></li>
+ <li><a href="{% url 'scipost:totp' %}">Two factor authentication</a></li>
+ </ul>
+ </div>
</div>
<div class="row">
@@ -171,47 +183,47 @@
</div>
{% if unavailability_form %}
- <hr>
- <div class="row">
- <div class="col">
- <h2 class="highlight">Your Availability</h2>
- </div>
+ <hr>
+ <div class="row">
+ <div class="col">
+ <h2 class="highlight">Your Availability</h2>
</div>
- <div class="row justify-content-center">
- <div class="col-md-4 mr-md-5">
- <p>To help with the editorial workflow, you can inform us of any periods during which you are unavailable. We will do our best to respect these.</p>
- <h3 class="mb-3">Mark a period as unavailable:</h3>
- <form action="{% url 'scipost:mark_unavailable_period' %}" method="post">
- {% csrf_token %}
- {{ unavailability_form|bootstrap }}
- <input class="btn btn-outline-secondary" type="submit" value="Submit" />
- </form>
- </div>
- <div class="col-md-4 ml-md-5">
- {% if unavailabilities %}
- <h3>Your unavailability periods in our records</h3>
- <p class="text-muted">(YYYY-MM-DD)</p>
- <table class="table">
- <tr>
- <th>Start</th>
- <th colspan="2">End</th>
- </tr>
- {% for unav in unavailabilities %}
- <tr>
- <td>{{ unav.start }}</td>
- <td>{{ unav.end }}</td>
- <td>
- <form action="{% url 'scipost:delete_unavailable_period' unav.id %}" method="post">
- {% csrf_token %}
- <input class="btn btn-danger" type="submit" value="Delete" />
- </form>
- </td>
- </tr>
- {% endfor %}
- </table>
- {% else %}
- <p>You don't have any upcoming unavailability periods on record.</p>
- {% endif %}
- </div>
+ </div>
+ <div class="row justify-content-center">
+ <div class="col-md-4 mr-md-5">
+ <p>To help with the editorial workflow, you can inform us of any periods during which you are unavailable. We will do our best to respect these.</p>
+ <h3 class="mb-3">Mark a period as unavailable:</h3>
+ <form action="{% url 'scipost:mark_unavailable_period' %}" method="post">
+ {% csrf_token %}
+ {{ unavailability_form|bootstrap }}
+ <input class="btn btn-outline-secondary" type="submit" value="Submit" />
+ </form>
</div>
+ <div class="col-md-4 ml-md-5">
+ {% if unavailabilities %}
+ <h3>Your unavailability periods in our records</h3>
+ <p class="text-muted">(YYYY-MM-DD)</p>
+ <table class="table">
+ <tr>
+ <th>Start</th>
+ <th colspan="2">End</th>
+ </tr>
+ {% for unav in unavailabilities %}
+ <tr>
+ <td>{{ unav.start }}</td>
+ <td>{{ unav.end }}</td>
+ <td>
+ <form action="{% url 'scipost:delete_unavailable_period' unav.id %}" method="post">
+ {% csrf_token %}
+ <input class="btn btn-danger" type="submit" value="Delete" />
+ </form>
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+ {% else %}
+ <p>You don't have any upcoming unavailability periods on record.</p>
+ {% endif %}
+ </div>
+ </div>
{% endif %}
diff --git a/scipost/templates/partials/scipost/personal_page/admin_actions.html b/scipost/templates/partials/scipost/personal_page/admin_actions.html
index 00b2829139dbb1f9bdea29ab40cd3855ced0ba7e..5e05b436d83458a68624ce794543a519e0196b13 100644
--- a/scipost/templates/partials/scipost/personal_page/admin_actions.html
+++ b/scipost/templates/partials/scipost/personal_page/admin_actions.html
@@ -1,98 +1,97 @@
{% load user_groups %}
+
{% is_scipost_admin request.user as is_scipost_admin %}
+
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title mb-0">Admin Actions</h2>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Admin Actions</h2>
+ </div>
</div>
+ </div>
</div>
<div class="row">
- {% if perms.scipost.can_vet_registration_requests or perms.scipost.can_create_registration_invitations or perms.scipost.can_resend_registration_requests or perms.scipost.can_manage_news %}
+ {% if perms.scipost.can_vet_registration_requests or perms.scipost.can_create_registration_invitations or perms.scipost.can_resend_registration_requests or perms.scipost.can_manage_news %}
<div class="col-md-4">
- <h3>Registration actions</h3>
- <ul>
- {% if perms.scipost.can_vet_registration_requests %}
- <li><a href="{% url 'scipost:vet_registration_requests' %}">Vet Registration requests</a> ({{ nr_reg_to_vet }})</li>
- {% endif %}
- {% if perms.scipost.can_resend_registration_requests %}
- <li><a href="{% url 'scipost:registration_requests' %}">Awaiting validation</a> ({{ nr_reg_awaiting_validation }})</li>
- {% endif %}
- {% if perms.scipost.can_create_registration_invitations %}
- <li><a href="{% url 'invitations:list' %}">Manage Registration Invitations</a></li>
- {% endif %}
- </ul>
-
- {% if perms.scipost.can_manage_news %}
- <h3>News management</h3>
- <ul>
- <li><a href="{% url 'news:manage' %}">Manage News Items and Newsletters</a></li>
- </ul>
- {% endif %}
-
- {% if perms.scipost.can_manage_registration_invitations %}
- <h3>Notifications</h3>
- <ul>
- <li><a href="{% url 'invitations:citation_notification_list' %}">Manage citation notifications</a></li>
- </ul>
+ <h3>Registration actions</h3>
+ <ul>
+ {% if perms.scipost.can_vet_registration_requests %}
+ <li><a href="{% url 'scipost:vet_registration_requests' %}">Vet Registration requests</a> ({{ nr_reg_to_vet }})</li>
+ {% endif %}
+ {% if perms.scipost.can_resend_registration_requests %}
+ <li><a href="{% url 'scipost:registration_requests' %}">Awaiting validation</a> ({{ nr_reg_awaiting_validation }})</li>
+ {% endif %}
+ {% if perms.scipost.can_create_registration_invitations %}
+ <li><a href="{% url 'invitations:list' %}">Manage Registration Invitations</a></li>
{% endif %}
+ </ul>
- {% if is_scipost_admin %}
- <h3>Email communications</h3>
- <ul>
- {% if perms.scipost.can_email_group_members %}
- <li><a href="{% url 'scipost:email_group_members' %}">Email Group Members</a></li>
- {% endif %}
- {% if perms.scipost.can_email_particulars %}
- <li><a href="{% url 'scipost:send_precooked_email' %}">Send a precooked email</a></li>
- <li><a href="{% url 'scipost:email_particular' %}">Email a particular individual/address</a></li>
- {% endif %}
- {% if perms.scipost.can_manage_mailchimp %}
- <li><a href="{% url 'mailing_lists:overview' %}">Manage mailing lists</a></li>
- {% endif %}
- </ul>
+ {% if perms.scipost.can_manage_news %}
+ <h3>News management</h3>
+ <ul>
+ <li><a href="{% url 'news:manage' %}">Manage News Items and Newsletters</a></li>
+ </ul>
+ {% endif %}
- {% endif %}
+ {% if perms.scipost.can_manage_registration_invitations %}
+ <h3>Notifications</h3>
+ <ul>
+ <li><a href="{% url 'invitations:citation_notification_list' %}">Manage citation notifications</a></li>
+ </ul>
+ {% endif %}
+
+ {% if is_scipost_admin %}
+ <h3>Email communications</h3>
+ <ul>
+ {% if perms.scipost.can_email_group_members %}
+ <li><a href="{% url 'scipost:email_group_members' %}">Email Group Members</a></li>
+ {% endif %}
+ {% if perms.scipost.can_email_particulars %}
+ <li><a href="{% url 'scipost:send_precooked_email' %}">Send a precooked email</a></li>
+ <li><a href="{% url 'scipost:email_particular' %}">Email a particular individual/address</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_mailchimp %}
+ <li><a href="{% url 'mailing_lists:overview' %}">Manage mailing lists</a></li>
+ {% endif %}
+ </ul>
+ {% endif %}
</div>
- {% endif %}
+ {% endif %}
- <div class="col-md-4">
- {% if perms.scipost.can_view_profiles %}
+ <div class="col-md-4">
+ {% if perms.scipost.can_view_profiles %}
<h3>Profiles</h3>
<ul>
- <li><a href="{% url 'profiles:profiles' %}">List/Manage Profiles</a></li>
+ <li><a href="{% url 'profiles:profiles' %}">List/Manage Profiles</a></li>
</ul>
- {% endif %}
+ {% endif %}
- <h3>Ontology</h3>
- <ul>
- <li><a href="{% url 'ontology:ontology' %}">View/Manage the Ontology</a></li>
- </ul>
+ <h3>Ontology</h3>
+ <ul>
+ <li><a href="{% url 'ontology:ontology' %}">View/Manage the Ontology</a></li>
+ </ul>
- {% if perms.scipost.can_manage_organizations %}
+ {% if perms.scipost.can_manage_organizations %}
<h3>Organizations</h3>
<ul>
- <li><a href="{% url 'organizations:organizations' %}">Manage Organizations</a></li>
+ <li><a href="{% url 'organizations:organizations' %}">Manage Organizations</a></li>
</ul>
- {% endif %}
-
- </div>
+ {% endif %}
+ </div>
- <div class="col-md-4">
- <h3>Finances</h3>
- <ul>
- {% if perms.scipost.can_manage_subsidies %}
- <li><a href="{% url 'finances:subsidies' %}">Manage Subsidies</a></li>
- {% endif %}
- {% if perms.scipost.can_view_timesheets %}
+ <div class="col-md-4">
+ <h3>Finances</h3>
+ <ul>
+ {% if perms.scipost.can_manage_subsidies %}
+ <li><a href="{% url 'finances:subsidies' %}">Manage Subsidies</a></li>
+ {% endif %}
+ {% if perms.scipost.can_view_timesheets %}
<li><a href="{% url 'finances:timesheets' %}">Production Team Timesheets</a></li>
- {% endif %}
- </ul>
- </div>
-
+ {% endif %}
+ </ul>
+ </div>
</div>
diff --git a/scipost/templates/partials/scipost/personal_page/author_replies.html b/scipost/templates/partials/scipost/personal_page/author_replies.html
index a5068722c3e1149064836afaa894da4d9ebd8604..e7a7611154a6a2bb196ac4cdb17318ec0d351272 100644
--- a/scipost/templates/partials/scipost/personal_page/author_replies.html
+++ b/scipost/templates/partials/scipost/personal_page/author_replies.html
@@ -1,23 +1,23 @@
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title mb-0">Your Author Replies</h2>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Your Author Replies</h2>
+ </div>
</div>
+ </div>
</div>
<div class="row" id="myauthorreplieslist">
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for own_reply in own_authorreplies %}
- <li class="list-group-item">
- {% include 'comments/_comment_card_extended_for_author.html' with comment=own_reply %}
- </li>
- {% empty %}
- <li class="list-group-item"><em>You do not have Author Replies yet.</em></li>
- {% endfor %}
- </ul>
- </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for own_reply in own_authorreplies %}
+ <li class="list-group-item">
+ {% include 'comments/_comment_card_extended_for_author.html' with comment=own_reply %}
+ </li>
+ {% empty %}
+ <li class="list-group-item"><em>You do not have Author Replies yet.</em></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
diff --git a/scipost/templates/partials/scipost/personal_page/commentaries.html b/scipost/templates/partials/scipost/personal_page/commentaries.html
index 650c2b9a04d7dc7a62d0536a0894f283b729af29..b5c5f76b5177f4f6e70a959ad73d5574ed24d0c6 100644
--- a/scipost/templates/partials/scipost/personal_page/commentaries.html
+++ b/scipost/templates/partials/scipost/personal_page/commentaries.html
@@ -1,32 +1,32 @@
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title">Commentaries</h2>
- <ul class="mb-0">
- {% if nr_commentary_authorships_to_claim > 0 %}
- <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_commentary_authorships_to_claim}})</a></li>
- {% endif %}
- <li><a href="{% url 'commentaries:request_commentary' %}">Request opening a SciPost Commentary Page</a></li>
- </ul>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title">Commentaries</h2>
+ <ul class="mb-0">
+ {% if nr_commentary_authorships_to_claim > 0 %}
+ <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_commentary_authorships_to_claim}})</a></li>
+ {% endif %}
+ <li><a href="{% url 'commentaries:request_commentary' %}">Request opening a SciPost Commentary Page</a></li>
+ </ul>
+ </div>
</div>
+ </div>
</div>
<div class="row" id="mycommentarieslist">
- <div class="col-12">
- <h3>Commentaries for which you are identified as an author:</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for com in own_commentaries %}
- <li class="list-group-item">
- {% include 'commentaries/_commentary_card_content.html' with commentary=com %}
- </li>
- {% empty %}
- <li class="list-group-item"><em>No Commentaries found</em></li>
- {% endfor %}
- </ul>
- </div>
+ <div class="col-12">
+ <h3>Commentaries for which you are identified as an author:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for com in own_commentaries %}
+ <li class="list-group-item">
+ {% include 'commentaries/_commentary_card_content.html' with commentary=com %}
+ </li>
+ {% empty %}
+ <li class="list-group-item"><em>No Commentaries found</em></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
diff --git a/scipost/templates/partials/scipost/personal_page/comments.html b/scipost/templates/partials/scipost/personal_page/comments.html
index afd1f9eca1422294b339fd3ceff48762d8b70a88..32857eef2a08e231ab63a396332c5d55c72f9149 100644
--- a/scipost/templates/partials/scipost/personal_page/comments.html
+++ b/scipost/templates/partials/scipost/personal_page/comments.html
@@ -1,23 +1,23 @@
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title mb-0">Your Comments</h2>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Your Comments</h2>
+ </div>
</div>
+ </div>
</div>
<div class="row" id="mycommentslist">
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for own_comment in own_comments %}
- <li class="list-group-item">
- {% include 'comments/_comment_card_extended_for_author.html' with comment=own_comment %}
- </li>
- {% empty %}
- <li class="list-group-item"><em>You have not commented yet.</em></li>
- {% endfor %}
- </ul>
- </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for own_comment in own_comments %}
+ <li class="list-group-item">
+ {% include 'comments/_comment_card_extended_for_author.html' with comment=own_comment %}
+ </li>
+ {% empty %}
+ <li class="list-group-item"><em>You have not commented yet.</em></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
diff --git a/scipost/templates/partials/scipost/personal_page/editorial_actions.html b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
index d88a280098931493c22747b22d9b8d3816c7e40c..6dae5039e2df8fd6aa5087e00a1ff68b831546ef 100644
--- a/scipost/templates/partials/scipost/personal_page/editorial_actions.html
+++ b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
@@ -1,123 +1,123 @@
{% load user_groups %}
+
{% is_scipost_admin request.user as is_scipost_admin %}
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title mb-0">Pending Editorial Actions</h2>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title mb-0">Pending Editorial Actions</h2>
+ </div>
</div>
+ </div>
</div>
<div class="row">
- <div class="col-md-4">
- {% if perms.scipost.can_vet_comments or perms.scipost.can_vet_submitted_reports %}
- <h3>Vetting actions</h3>
- <ul>
- {% if perms.scipost.can_vet_commentary_requests %}
- <li><a href="{% url 'commentaries:vet_commentary_requests' %}">Vet Commentary Page requests</a> ({{ nr_commentary_page_requests_to_vet }})</li>
- {% endif %}
- {% if perms.scipost.can_vet_comments %}
- <li><a href="{% url 'comments:vet_submitted_comments_list' %}">Vet submitted Comments</a> ({{ nr_comments_to_vet }})</li>
- {% endif %}
- {% if perms.scipost.can_vet_thesislink_requests %}
- <li><a href="{% url 'theses:unvetted_thesislinks' %}">Vet Thesis Link Requests</a> ({{ nr_thesislink_requests_to_vet }})</li>
- {% endif %}
- {% if perms.scipost.can_vet_authorship_claims %}
- <li><a href="{% url 'scipost:vet_authorship_claims' %}">Vet Authorship Claims</a> ({{ nr_authorship_claims_to_vet }})</li>
- {% endif %}
- {% if perms.scipost.can_vet_submitted_reports %}
- <li><a href="{% url 'submissions:vet_submitted_reports_list' %}">Vet submitted Reports</a> ({{ nr_reports_to_vet }})</li>
- {% endif %}
- </ul>
+ <div class="col-md-4">
+ {% if perms.scipost.can_vet_comments or perms.scipost.can_vet_submitted_reports %}
+ <h3>Vetting actions</h3>
+ <ul>
+ {% if perms.scipost.can_vet_commentary_requests %}
+ <li><a href="{% url 'commentaries:vet_commentary_requests' %}">Vet Commentary Page requests</a> ({{ nr_commentary_page_requests_to_vet }})</li>
{% endif %}
-
- {% if perms.scipost.can_oversee_refereeing %}
- <h3>Editorial Admin actions</h3>
- <ul>
- <li><a href="{% url 'submissions:reports_accepted_list' %}">Accepted Reports</a>{% if nr_reports_without_pdf %} ({{nr_reports_without_pdf}} unfinished){% endif %}</li>
- <li><a href="{% url 'submissions:pool' %}">Submissions Pool</a></li>
- <li><a href="{% url 'submissions:treated_submissions_list' %}">Fully treated Submissions</a>{% if nr_treated_submissions_without_pdf %} ({{nr_treated_submissions_without_pdf}} unfinished){% endif %}</li>
- <li><a href="{% url 'journals:harvest_citedby_list' %}">Harvest citedby data</a></li>
- <li><a href="{% url 'journals:manage_comment_metadata' %}">Manage Comment metadata</a></li>
- <li><a href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a></li>
- <li><a href="{% url 'journals:admin_issue_list' %}">Manage Issues</a></li>
- <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li>
- <li><a href="{% url 'journals:manage_metadata' %}">Manage Publication metadata</a></li>
- <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li>
- </ul>
+ {% if perms.scipost.can_vet_comments %}
+ <li><a href="{% url 'comments:vet_submitted_comments_list' %}">Vet submitted Comments</a> ({{ nr_comments_to_vet }})</li>
+ {% endif %}
+ {% if perms.scipost.can_vet_thesislink_requests %}
+ <li><a href="{% url 'theses:unvetted_thesislinks' %}">Vet Thesis Link Requests</a> ({{ nr_thesislink_requests_to_vet }})</li>
{% endif %}
+ {% if perms.scipost.can_vet_authorship_claims %}
+ <li><a href="{% url 'scipost:vet_authorship_claims' %}">Vet Authorship Claims</a> ({{ nr_authorship_claims_to_vet }})</li>
+ {% endif %}
+ {% if perms.scipost.can_vet_submitted_reports %}
+ <li><a href="{% url 'submissions:vet_submitted_reports_list' %}">Vet submitted Reports</a> ({{ nr_reports_to_vet }})</li>
+ {% endif %}
+ </ul>
+ {% endif %}
- </div>
+ {% if perms.scipost.can_oversee_refereeing %}
+ <h3>Editorial Admin actions</h3>
+ <ul>
+ <li><a href="{% url 'submissions:reports_accepted_list' %}">Accepted Reports</a>{% if nr_reports_without_pdf %} ({{nr_reports_without_pdf}} unfinished){% endif %}</li>
+ <li><a href="{% url 'submissions:pool' %}">Submissions Pool</a></li>
+ <li><a href="{% url 'submissions:treated_submissions_list' %}">Fully treated Submissions</a>{% if nr_treated_submissions_without_pdf %} ({{nr_treated_submissions_without_pdf}} unfinished){% endif %}</li>
+ <li><a href="{% url 'journals:harvest_citedby_list' %}">Harvest citedby data</a></li>
+ <li><a href="{% url 'journals:manage_comment_metadata' %}">Manage Comment metadata</a></li>
+ <li><a href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a></li>
+ <li><a href="{% url 'journals:admin_issue_list' %}">Manage Issues</a></li>
+ <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li>
+ <li><a href="{% url 'journals:manage_metadata' %}">Manage Publication metadata</a></li>
+ <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li>
+ </ul>
+ {% endif %}
- {% if perms.scipost.can_oversee_refereeing or request.user.contributor.is_MEC %}
- <div class="col-md-4">
- <h3>Info</h3>
- <ul>
- <li><a href="{% url 'submissions:editorial_workflow' %}">How-to guide: summary of the editorial workflow</a></li>
- </ul>
+ </div>
- <h3>Submissions assignments</h3>
- <ul>
- <li><a href="{% url 'submissions:assignments' %}">Your assignments</a></li>
- <li><a href="{% url 'scipost:Fellow_activity_overview' %}">View assignments overview</a></li>
+ {% if perms.scipost.can_oversee_refereeing or request.user.contributor.is_MEC %}
+ <div class="col-md-4">
+ <h3>Info</h3>
+ <ul>
+ <li><a href="{% url 'submissions:editorial_workflow' %}">How-to guide: summary of the editorial workflow</a></li>
+ </ul>
- {% if perms.scipost.can_assign_submissions %}
- <li>Assign Submissions via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_submissions_to_assign }})</li>
- {% endif %}
- {% if request.user.contributor.is_MEC %}
- <li>Accept or decline assignments via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_assignments_to_consider }})</li>
- {% endif %}
- </ul>
+ <h3>Submissions assignments</h3>
+ <ul>
+ <li><a href="{% url 'submissions:assignments' %}">Your assignments</a></li>
+ <li><a href="{% url 'scipost:Fellow_activity_overview' %}">View assignments overview</a></li>
- {% if perms.scipost.can_oversee_refereeing %}
- <h3>Refereeing overview</h3>
- <ul>
- <li>View (and act on) outstanding refereeing invitations in the <a href="{% url 'submissions:refereeing_overview' %}">refereeing overview</a></li>
- <li><a href="{% url 'stats:statistics' %}">View statistics</a> for submissions, refereeing, publishing</li>
- </ul>
- <h3>Voting</h3>
- <ul>
- <li>Prepare Editorial Recommendations for voting via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_recommendations_to_prepare_for_voting }})</li>
- </ul>
- {% endif %}
- </div>
- {% endif %}
+ {% if perms.scipost.can_assign_submissions %}
+ <li>Assign Submissions via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_submissions_to_assign }})</li>
+ {% endif %}
+ {% if request.user.contributor.is_MEC %}
+ <li>Accept or decline assignments via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_assignments_to_consider }})</li>
+ {% endif %}
+ </ul>
+
+ {% if perms.scipost.can_oversee_refereeing %}
+ <h3>Refereeing overview</h3>
+ <ul>
+ <li>View (and act on) outstanding refereeing invitations in the <a href="{% url 'submissions:refereeing_overview' %}">refereeing overview</a></li>
+ <li><a href="{% url 'stats:statistics' %}">View statistics</a> for submissions, refereeing, publishing</li>
+ </ul>
+ <h3>Voting</h3>
+ <ul>
+ <li>Prepare Editorial Recommendations for voting via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_recommendations_to_prepare_for_voting }})</li>
+ </ul>
+ {% endif %}
+ </div>
+ {% endif %}
<div class="col-md-4">
{% if perms.scipost.can_manage_college_composition or perms.scipost.can_view_potentialfellowship_list %}
- <h3>Colleges and Fellowships</h3>
- <ul>
- <li><a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships: view{% if perms.scipost.can_manage_college_composition %} and manage{% endif %}</a></li>
- {% if perms.scipost.can_manage_college_composition %}
- <li><a href="{% url 'colleges:fellowships' %}">Manage Fellowships</a></li>
- {% endif %}
- </ul>
+ <h3>Colleges and Fellowships</h3>
+ <ul>
+ <li><a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships: view{% if perms.scipost.can_manage_college_composition %} and manage{% endif %}</a></li>
+ {% if perms.scipost.can_manage_college_composition %}
+ <li><a href="{% url 'colleges:fellowships' %}">Manage Fellowships</a></li>
+ {% endif %}
+ </ul>
{% endif %}
</div>
-
</div>
{% if active_assignments %}
- <div class="row">
- <div class="col-12">
- <h3 class="highlight">Submissions for which you are Editor-in-charge</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for assignment in active_assignments %}
- <li class="list-group-item">
- <div class="card-body px-0">
- {% include 'partials/submissions/submission_card_content.html' with submission=assignment.submission %}
- {% include 'partials/submissions/submission_status.html' with submission=assignment.submission %}
- <p class="card-text mt-2">Manage this Submission from its <a href="{% url 'submissions:editorial_page' assignment.submission.preprint.identifier_w_vn_nr %}">Editorial Page</a>.</p>
- </div>
- </li>
- {% endfor %}
- </ul>
- </div>
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Submissions for which you are Editor-in-charge</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for assignment in active_assignments %}
+ <li class="list-group-item">
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=assignment.submission %}
+ {% include 'partials/submissions/submission_status.html' with submission=assignment.submission %}
+ <p class="card-text mt-2">Manage this Submission from its <a href="{% url 'submissions:editorial_page' assignment.submission.preprint.identifier_w_vn_nr %}">Editorial Page</a>.</p>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
</div>
+ </div>
{% endif %}
diff --git a/scipost/templates/partials/scipost/personal_page/publications.html b/scipost/templates/partials/scipost/personal_page/publications.html
index c1942c31002534b7251fa69a7f1d151ac3a57404..d10602c7a39f419924b097647484238b696baa83 100644
--- a/scipost/templates/partials/scipost/personal_page/publications.html
+++ b/scipost/templates/partials/scipost/personal_page/publications.html
@@ -1,42 +1,41 @@
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title">Publications</h2>
- <ul class="mb-0">
- {% if nr_publication_authorships_to_claim > 0 %}
- <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_publication_authorships_to_claim}})</a></li>
- {% endif %}
- </ul>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title">Publications</h2>
+ <ul class="mb-0">
+ {% if nr_publication_authorships_to_claim > 0 %}
+ <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_publication_authorships_to_claim}})</a></li>
+ {% endif %}
+ </ul>
+ </div>
</div>
+ </div>
</div>
<div class="row" id="mypublicationslist">
- <div class="col-12">
- <h3 class="mb-3">Publications for which you are identified as an author:</h3>
- </div>
- <div class="col-12">
- <ul class="list-unstyled">
- {% for pub in own_publications %}
- <li>
- <div class="card bg-light card-publication" id="{{pub.doi_label}}">
- {% include 'journals/_publication_card_content.html' with publication=pub current_user=request.user %}
- {% if request.user == pub.accepted_submission.submitted_by.user %}
- {% if not pub.pubfractions_confirmed_by_authors or not pub.pubfractions_sum_to_1 %}
-
- <h4 class="m-2"><a href="{% url 'journals:allocate_orgpubfractions' doi_label=pub.doi_label %}"><span class="text-danger">Intervention needed:</span> review support fractions</a></h4>
- {% endif %}
- {% endif %}
- </div>
- </li>
- {% empty %}
- <li>
- <em>No Publications found</em>
- </li>
- {% endfor %}
- </ul>
- </div>
+ <div class="col-12">
+ <h3 class="mb-3">Publications for which you are identified as an author:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-unstyled">
+ {% for pub in own_publications %}
+ <li>
+ <div class="card bg-light card-publication" id="{{pub.doi_label}}">
+ {% include 'journals/_publication_card_content.html' with publication=pub current_user=request.user %}
+ {% if request.user == pub.accepted_submission.submitted_by.user %}
+ {% if not pub.pubfractions_confirmed_by_authors or not pub.pubfractions_sum_to_1 %}
+ <h4 class="m-2"><a href="{% url 'journals:allocate_orgpubfractions' doi_label=pub.doi_label %}"><span class="text-danger">Intervention needed:</span> review support fractions</a></h4>
+ {% endif %}
+ {% endif %}
+ </div>
+ </li>
+ {% empty %}
+ <li>
+ <em>No Publications found</em>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
diff --git a/scipost/templates/partials/scipost/personal_page/refereeing.html b/scipost/templates/partials/scipost/personal_page/refereeing.html
index fc650446175572eeed36bbfe6dbfdb4cb85bd31b..8f94f600af919af5bda3ed5b01d6698061f149f3 100644
--- a/scipost/templates/partials/scipost/personal_page/refereeing.html
+++ b/scipost/templates/partials/scipost/personal_page/refereeing.html
@@ -1,144 +1,141 @@
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title">Refereeing Tasks</h2>
- <ul class="mb-0">
- <li><a href="{% url 'submissions:accept_or_decline_ref_invitations' %}">Accept/decline refereeing invitations</a> ({{ contributor.referee_invitations.open.count }})</li>
- </ul>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title">Refereeing Tasks</h2>
+ <ul class="mb-0">
+ <li><a href="{% url 'submissions:accept_or_decline_ref_invitations' %}">Accept/decline refereeing invitations</a> ({{ contributor.referee_invitations.open.count }})</li>
+ </ul>
+ </div>
</div>
+ </div>
</div>
{% if contributor.reports.in_draft.all %}
- <div class="row">
- <div class="col-12">
- <h3 class="highlight">Unfinished reports:</h3>
- <ul class="list-group list-group-flush">
- {% for report in contributor.reports.in_draft.all %}
- <li class="list-group-item">
- <div class="card-body px-0">
- {% include 'partials/submissions/submission_li.html' with submission=report.submission %}
-
- <a class="btn btn-outline-primary my-2" href="{% url 'submissions:submit_report' report.submission.preprint.identifier_w_vn_nr %}">Finish report</a>
- </div>
- </li>
- {% endfor %}
- </ul>
- </div>
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Unfinished reports:</h3>
+ <ul class="list-group list-group-flush">
+ {% for report in contributor.reports.in_draft.all %}
+ <li class="list-group-item">
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_li.html' with submission=report.submission %}
+ <a class="btn btn-outline-primary my-2" href="{% url 'submissions:submit_report' report.submission.preprint.identifier_w_vn_nr %}">Finish report</a>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
</div>
+ </div>
{% endif %}
<div class="row">
- <div class="col-12">
- <h3 class="highlight">Refereeing Invitations</h3>
- {% if contributor.referee_invitations.all %}
- <h3 class="mt-4">Pending Refereeing Invitations</h3>
- {% if contributor.referee_invitations.in_process.all %}
- <ul class="list-group list-group-flush">
- {% for invitation in contributor.referee_invitations.in_process.all %}
- <li class="list-group-item py-2">
- {% include 'partials/submissions/submission_li.html' with submission=invitation.submission %}
+ <div class="col-12">
+ <h3 class="highlight">Refereeing Invitations</h3>
+ {% if contributor.referee_invitations.all %}
+ <h3 class="mt-4">Pending Refereeing Invitations</h3>
+ {% if contributor.referee_invitations.in_process.all %}
+ <ul class="list-group list-group-flush">
+ {% for invitation in contributor.referee_invitations.in_process.all %}
+ <li class="list-group-item py-2">
+ {% include 'partials/submissions/submission_li.html' with submission=invitation.submission %}
+ <table>
+ <tr>
+ <th style='min-width: 100px;'>Due:</th>
+ <td>{{ invitation.submission.reporting_deadline|date:'d F Y' }}{% if invitation.submission.reporting_deadline_has_passed %} <span class="label label-sm label-danger ml-2 px-3">overdue</span> {% endif %}<td>
+ </tr>
+ <tr>
+ <th>Status:</th>
+ <td>{{ invitation.get_status_display }}</td>
+ </tr>
+ {% if invitation.accepted is not None %}
+ <tr>
+ <th>{{ invitation.accepted|yesno:'Accepted,Declined' }}:</th>
+ <td>{{ invitation.date_responded }}</td>
+ </tr>
+ {% endif %}
+ <tr>
+ <td colspan="2">
+ <a class="d-inline-block" href="{% url 'submissions:submit_report' identifier_w_vn_nr=invitation.submission.preprint.identifier_w_vn_nr %}">Submit your Report</a> <span class="text-blue">|</span>
+ <a class="d-inline-block" href="{% url 'submissions:communication' identifier_w_vn_nr=invitation.submission.preprint.identifier_w_vn_nr comtype='RtoE' referee_id=request.user.contributor.id %}">Write to the Editor-in-charge</a>
+ </td>
+ </tr>
+ </table>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <p><em>You do not have any pending refereeing task</em></p>
+ {% endif %}
- <table>
- <tr>
- <th style='min-width: 100px;'>Due:</th>
- <td>{{ invitation.submission.reporting_deadline|date:'d F Y' }}{% if invitation.submission.reporting_deadline_has_passed %} <span class="label label-sm label-danger ml-2 px-3">overdue</span> {% endif %}<td>
- </tr>
- <tr>
- <th>Status:</th>
- <td>{{ invitation.get_status_display }}</td>
- </tr>
- {% if invitation.accepted is not None %}
- <tr>
- <th>{{ invitation.accepted|yesno:'Accepted,Declined' }}:</th>
- <td>{{ invitation.date_responded }}</td>
- </tr>
- {% endif %}
- <tr>
- <td colspan="2">
- <a class="d-inline-block" href="{% url 'submissions:submit_report' identifier_w_vn_nr=invitation.submission.preprint.identifier_w_vn_nr %}">Submit your Report</a> <span class="text-blue">|</span>
- <a class="d-inline-block" href="{% url 'submissions:communication' identifier_w_vn_nr=invitation.submission.preprint.identifier_w_vn_nr comtype='RtoE' referee_id=request.user.contributor.id %}">Write to the Editor-in-charge</a>
- </td>
- </tr>
- </table>
- </li>
- {% endfor %}
- </ul>
- {% else %}
- <p><em>You do not have any pending refereeing task</em></p>
- {% endif %}
-
- <br>
- <h3><a href="javascript:;" data-toggle="toggle" data-target="#all-invitations">+ See all Refereeing Invitations ({{ contributor.referee_invitations.all|length }})</a></h3>
- <ul class="list-group list-group-flush ml-md-4" id="all-invitations" style="display: none;">
- {% for invitation in contributor.referee_invitations.all %}
- <li class="list-group-item py-2">
- {% include 'partials/submissions/submission_li.html' with submission=invitation.submission %}
-
- <table>
- <tr>
- <th style='min-width: 100px;'>Status:</th>
- <td>{{ invitation.get_status_display }}</td>
- </tr>
- {% if invitation.accepted is not None %}
- <tr>
- <th>{{ invitation.accepted|yesno:'Accepted,Declined' }}:</th>
- <td>{{ invitation.date_responded }}</td>
- </tr>
- {% endif %}
- {% if invitation.related_report %}
- <tr>
- <th>Report:</th>
- <td><a href="{{ invitation.related_report.get_absolute_url }}">{{ invitation.related_report.citation|default:'Link' }}</a></td>
- </tr>
- {% endif %}
- </table>
- </li>
- {% endfor %}
- </ul>
- {% else %}
- <p><em>You do not have any refereeing invitation</em></p>
- {% endif %}
- </div>
+ <br>
+ <h3><a href="javascript:;" data-toggle="toggle" data-target="#all-invitations">+ See all Refereeing Invitations ({{ contributor.referee_invitations.all|length }})</a></h3>
+ <ul class="list-group list-group-flush ml-md-4" id="all-invitations" style="display: none;">
+ {% for invitation in contributor.referee_invitations.all %}
+ <li class="list-group-item py-2">
+ {% include 'partials/submissions/submission_li.html' with submission=invitation.submission %}
+ <table>
+ <tr>
+ <th style='min-width: 100px;'>Status:</th>
+ <td>{{ invitation.get_status_display }}</td>
+ </tr>
+ {% if invitation.accepted is not None %}
+ <tr>
+ <th>{{ invitation.accepted|yesno:'Accepted,Declined' }}:</th>
+ <td>{{ invitation.date_responded }}</td>
+ </tr>
+ {% endif %}
+ {% if invitation.related_report %}
+ <tr>
+ <th>Report:</th>
+ <td><a href="{{ invitation.related_report.get_absolute_url }}">{{ invitation.related_report.citation|default:'Link' }}</a></td>
+ </tr>
+ {% endif %}
+ </table>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <p><em>You do not have any refereeing invitation</em></p>
+ {% endif %}
+ </div>
</div>
{% if contributor.reports.non_draft.all %}
- <div class="row">
- <div class="col-12">
- <h3 class="highlight">Finished reports</h3>
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Finished reports</h3>
- <ul class="list-group list-group-flush">
- {% for report in contributor.reports.non_draft.all %}
- <li class="list-group-item">
- {% comment %}
- Temporary: There is already a template for a "Report summary" in a parallel (unmerged) branch. Awaiting merge to use that template.
- {% endcomment %}
- <div class="card-body px-0 {% block cardblock_class_block %}{% endblock %}">
- <h3>Report on Submission <a href="{{report.submission.get_absolute_url}}">{{report.submission.title}}</a></h3>
- <table>
- <tr>
- <th style='min-width: 100px;'>Received:</th><td>{{ report.date_submitted|date:'Y-n-j' }}<td>
- </tr>
- <tr>
- <th>Status:</th><td {% if report.status == 'vetted' %}class="text-success"{% elif report.status == 'unvetted' %}class="text-danger"{% endif %}>{{report.get_status_display}}</td>
- </tr>
- {% if report.doi_label %}
- <tr>
- <th>DOI:</th>
- <td>{{ report.doi_string }}</td>
- </tr>
- {% endif %}
- <tr>
- <th>Anonymous:</th><td>{{report.anonymous|yesno:'Yes,No'}}</td>{% if report.anonymous %}<td>You can <a href="{% url 'journals:sign_existing_report' report_id=report.id %}">click here to sign this Report</a> (leads to confirmation page){% endif %}</td>
- </tr>
- </table>
- </div>
- </li>
- {% endfor %}
- </ul>
- </div>
+ <ul class="list-group list-group-flush">
+ {% for report in contributor.reports.non_draft.all %}
+ <li class="list-group-item">
+ {% comment %}
+ Temporary: There is already a template for a "Report summary" in a parallel (unmerged) branch. Awaiting merge to use that template.
+ {% endcomment %}
+ <div class="card-body px-0 {% block cardblock_class_block %}{% endblock %}">
+ <h3>Report on Submission <a href="{{ report.submission.get_absolute_url }}">{{ report.submission.title }}</a></h3>
+ <table>
+ <tr>
+ <th style='min-width: 100px;'>Received:</th><td>{{ report.date_submitted|date:'Y-n-j' }}<td>
+ </tr>
+ <tr>
+ <th>Status:</th><td {% if report.status == 'vetted' %}class="text-success"{% elif report.status == 'unvetted' %}class="text-danger"{% endif %}>{{report.get_status_display}}</td>
+ </tr>
+ {% if report.doi_label %}
+ <tr>
+ <th>DOI:</th>
+ <td>{{ report.doi_string }}</td>
+ </tr>
+ {% endif %}
+ <tr>
+ <th>Anonymous:</th><td>{{report.anonymous|yesno:'Yes,No'}}</td>{% if report.anonymous %}<td>You can <a href="{% url 'journals:sign_existing_report' report_id=report.id %}">click here to sign this Report</a> (leads to confirmation page){% endif %}</td>
+ </tr>
+ </table>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
</div>
+ </div>
{% endif %}
diff --git a/scipost/templates/partials/scipost/personal_page/submissions.html b/scipost/templates/partials/scipost/personal_page/submissions.html
index 750c4b25191d4852fdf24c04041d5d36eaac9f84..f398614edf31b368fde6c3e8a7eeaa6d522f09d5 100644
--- a/scipost/templates/partials/scipost/personal_page/submissions.html
+++ b/scipost/templates/partials/scipost/personal_page/submissions.html
@@ -1,55 +1,54 @@
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title">Submissions</h2>
- <ul class="mb-0">
- {% if nr_submission_authorships_to_claim > 0 %}
- <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_submission_authorships_to_claim }})</a></li>
- {% endif %}
- <li><a href="{% url 'submissions:submit_manuscript' %}">Submit an arXiv preprint to a SciPost Journal</a></li>
- </ul>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title">Submissions</h2>
+ <ul class="mb-0">
+ {% if nr_submission_authorships_to_claim > 0 %}
+ <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_submission_authorships_to_claim }})</a></li>
+ {% endif %}
+ <li><a href="{% url 'submissions:submit_manuscript' %}">Submit an arXiv preprint to a SciPost Journal</a></li>
+ </ul>
+ </div>
</div>
+ </div>
</div>
-{# {% if own_submissions %}#}
+
<div class="row" id="mysubmissionslist">
- <div class="col-12">
- <h3>Submissions for which you are identified as an author:</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for sub in own_submissions %}
- <li class="list-group-item">
- <div class="card-body px-0">
- {% include 'partials/submissions/submission_card_content.html' with submission=sub %}
- {% include 'partials/submissions/submission_status.html' with submission=sub %}
+ <div class="col-12">
+ <h3>Submissions for which you are identified as an author:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for sub in own_submissions %}
+ <li class="list-group-item">
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=sub %}
+ {% include 'partials/submissions/submission_status.html' with submission=sub %}
- {% if request.user.contributor == sub.submitted_by %}
- <p class="card-text mt-1">
- <ul>
- {% if sub.open_for_resubmission %}
- <li>To resubmit, go to the <a href="{% url 'submissions:resubmit_manuscript' %}">resubmission page</a></li>
- {% endif %}
- {% if sub.under_consideration %}
- {% if sub.editor_in_charge %}
- <li><a href="{% url 'submissions:communication' sub.preprint.identifier_w_vn_nr 'AtoE' %}">Write to the Editor-in-charge</a></li>
- {% endif %}
- <li><a href="{% url 'submissions:withdraw_manuscript' sub.preprint.identifier_w_vn_nr %}"><span class="text-danger">Withdraw</span></a> (leads to confirmation page)</li>
- {% endif %}
- </ul>
- </p>
- {% endif %}
- </div>
- </li>
- {% empty %}
- <li class="list-group-item">
- <em>No Submissions found</em>
- </li>
- {% endfor %}
- </ul>
- </div>
+ {% if request.user.contributor == sub.submitted_by %}
+ <p class="card-text mt-1">
+ <ul>
+ {% if sub.open_for_resubmission %}
+ <li>To resubmit, go to the <a href="{% url 'submissions:resubmit_manuscript' %}">resubmission page</a></li>
+ {% endif %}
+ {% if sub.under_consideration %}
+ {% if sub.editor_in_charge %}
+ <li><a href="{% url 'submissions:communication' sub.preprint.identifier_w_vn_nr 'AtoE' %}">Write to the Editor-in-charge</a></li>
+ {% endif %}
+ <li><a href="{% url 'submissions:withdraw_manuscript' sub.preprint.identifier_w_vn_nr %}"><span class="text-danger">Withdraw</span></a> (leads to confirmation page)</li>
+ {% endif %}
+ </ul>
+ </p>
+ {% endif %}
+ </div>
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ <em>No Submissions found</em>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
-{# {% endif %}#}
diff --git a/scipost/templates/partials/scipost/personal_page/theses.html b/scipost/templates/partials/scipost/personal_page/theses.html
index 33fdc2a4be19b584994d2009d5953c1444110a96..4068f0168be428398c34231560a4856557fb808b 100644
--- a/scipost/templates/partials/scipost/personal_page/theses.html
+++ b/scipost/templates/partials/scipost/personal_page/theses.html
@@ -1,32 +1,32 @@
<div class="row">
- <div class="col-12">
- <div class="card bg-light">
- <div class="card-body">
- <h2 class="card-title">Theses</h2>
- <ul class="mb-0">
- {% if nr_thesis_authorships_to_claim > 0 %}
- <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_thesis_authorships_to_claim}})</a></li>
- {% endif %}
- <li><a href="{% url 'theses:request_thesislink' %}">Request a SciPost ThesisLink</a></li>
- </ul>
- </div>
- </div>
+ <div class="col-12">
+ <div class="card bg-light">
+ <div class="card-body">
+ <h2 class="card-title">Theses</h2>
+ <ul class="mb-0">
+ {% if nr_thesis_authorships_to_claim > 0 %}
+ <li><a href="{% url 'scipost:claim_authorships' %}">Potential authorships to claim (auto-detected: {{ nr_thesis_authorships_to_claim}})</a></li>
+ {% endif %}
+ <li><a href="{% url 'theses:request_thesislink' %}">Request a SciPost ThesisLink</a></li>
+ </ul>
+ </div>
</div>
+ </div>
</div>
<div class="row" id="mytheseslist">
- <div class="col-12">
- <h3>Theses for which you are identified as an author:</h3>
- </div>
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for thesis in own_thesislinks %}
- <li class="list-group-item">
- {% include 'theses/_thesislink_card_content.html' with thesislink=thesis %}
- </li>
- {% empty %}
- <li class="list-group-item"><em>No Theses found</em></li>
- {% endfor %}
- </ul>
- </div>
+ <div class="col-12">
+ <h3>Theses for which you are identified as an author:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for thesis in own_thesislinks %}
+ <li class="list-group-item">
+ {% include 'theses/_thesislink_card_content.html' with thesislink=thesis %}
+ </li>
+ {% empty %}
+ <li class="list-group-item"><em>No Theses found</em></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
diff --git a/scipost/templates/partials/scipost/remark_as_li.html b/scipost/templates/partials/scipost/remark_as_li.html
index 6554304e1a0a9f616a753188233660e4226dfbbf..f9ab0cff9fc271aa674a35d2bb63650e65ae1854 100644
--- a/scipost/templates/partials/scipost/remark_as_li.html
+++ b/scipost/templates/partials/scipost/remark_as_li.html
@@ -1 +1 @@
-<li><em>{{remark.contributor.first_name}} {{remark.contributor.last_name}} on {{remark.date|date:'Y-m-j'}}</em><p>{{remark.remark}}</p>
+<li><em>{{ remark.contributor.first_name }} {{ remark.contributor.last_name }} on {{ remark.date|date:'Y-m-j' }}</em><p>{{ remark.remark }}</p>