diff --git a/finances/templates/finances/worklog_confirm_delete.html b/finances/templates/finances/worklog_confirm_delete.html
index cc03bcc7db216d340cdee18bff64e842a149e612..9b6200d7c1a022dbb8d7f9247cfcecff803eba0a 100644
--- a/finances/templates/finances/worklog_confirm_delete.html
+++ b/finances/templates/finances/worklog_confirm_delete.html
@@ -14,7 +14,7 @@
<div class="row">
<div class="col-12">
<h1 class="highlight">Delete log</h1>
- {% include 'submissions/_submission_card_content_sparse.html' with submission=object.content.submission %}
+ {% include 'partials/submissions/submission_card_content.html' with submission=object.content.submission %}
</div>
</div>
<div class="row">
diff --git a/journals/templates/journals/journal_accepted.html b/journals/templates/journals/journal_accepted.html
index 7b1b7a0b0b9efb37beb87dcade9a80cef23a6109..2eb16483da99aa3932b753af4b69e555a40c39af 100644
--- a/journals/templates/journals/journal_accepted.html
+++ b/journals/templates/journals/journal_accepted.html
@@ -21,7 +21,9 @@
<ul class="list-group list-group-flush">
{% for submission in accepted_SP_submissions %}
<li class="list-group-item">
- {% include 'submissions/_submission_card_content.html' with submission=submission %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=submission %}
+ </div>
</li>
{% empty %}
<li class="list-group-item">
diff --git a/production/templates/production/partials/production_stream_card_completed.html b/production/templates/production/partials/production_stream_card_completed.html
index fd91b061844a670150a47a19464e9ceaf26227a2..e938b1d37d4c21929b5156d3595f5f10fd54976b 100644
--- a/production/templates/production/partials/production_stream_card_completed.html
+++ b/production/templates/production/partials/production_stream_card_completed.html
@@ -4,8 +4,8 @@
{% get_obj_perms request.user for stream as "sub_perms" %}
-<div class="card-body py-0" id="stream_{{stream.id}}">
- {% include 'submissions/_submission_card_content_sparse.html' with submission=stream.submission %}
+<div class="card-body" id="stream_{{stream.id}}">
+ {% include 'partials/submissions/submission_card_content.html' with submission=stream.submission %}
</div>
<div class="card-body">
<h3>Stream details</h3>
diff --git a/production/templates/production/productionevent_confirm_delete.html b/production/templates/production/productionevent_confirm_delete.html
index c6cd4c05a4da812c0739cc41bab2f72103b4f4ae..6661f0406c64a0637abe95540ca8bf4f8d2d2c27 100644
--- a/production/templates/production/productionevent_confirm_delete.html
+++ b/production/templates/production/productionevent_confirm_delete.html
@@ -12,7 +12,7 @@
<div class="row">
<div class="col-12">
<h1 class="highlight">Delete production event</h1>
- {% include 'submissions/_submission_card_content_sparse.html' with submission=object.stream.submission %}
+ {% include 'partials/submissions/submission_card_content.html' with submission=object.stream.submission %}
</div>
</div>
<div class="row">
diff --git a/production/templates/production/productionevent_form.html b/production/templates/production/productionevent_form.html
index d520f1c75c2a200a9657e62dec024527fe0d1055..854949c7c79d35ecc6bbe178227d58327091d369 100644
--- a/production/templates/production/productionevent_form.html
+++ b/production/templates/production/productionevent_form.html
@@ -12,7 +12,7 @@
<div class="row">
<div class="col-12">
<h1 class="highlight">Edit production event</h1>
- {% include 'submissions/_submission_card_content_sparse.html' with submission=object.stream.submission %}
+ {% include 'partials/submissions/submission_card_content.html' with submission=object.stream.submission %}
</div>
</div>
<div class="row">
diff --git a/production/templates/production/proofs.html b/production/templates/production/proofs.html
index 8a2f4071aadfd9296f1939117d332af4933f4738..bfbaa7937fdd75a7a6d0a230882174e77609428c 100644
--- a/production/templates/production/proofs.html
+++ b/production/templates/production/proofs.html
@@ -13,7 +13,7 @@
<div class="row">
<div class="col-12">
<h1 class="highlight">Proofs (version {{ proofs.version }})</h1>
- {% include 'submissions/_submission_card_content_sparse.html' with submission=stream.submission %}
+ {% include 'partials/submissions/submission_card_content.html' with submission=stream.submission %}
</div>
</div>
<div class="row">
diff --git a/production/templates/production/upload_proofs.html b/production/templates/production/upload_proofs.html
index 09970ec96a500852c38c7b745db653ec10f0c9d9..55efa68990e527c266748dbedc5dea085a9a4714 100644
--- a/production/templates/production/upload_proofs.html
+++ b/production/templates/production/upload_proofs.html
@@ -12,7 +12,7 @@
<div class="row">
<div class="col-12">
<h1 class="highlight">Upload Proofs</h1>
- {% include 'submissions/_submission_card_content_sparse.html' with submission=stream.submission %}
+ {% include 'partials/submissions/submission_card_content.html' with submission=stream.submission %}
</div>
</div>
<div class="row">
diff --git a/scipost/templates/scipost/Fellow_activity_overview.html b/scipost/templates/scipost/Fellow_activity_overview.html
index 5b5ecac15bc8c0fa3e400575f5c2aad4aef99ae5..dcfe8de994c2eb99145f8c0818d843ee436aa427 100644
--- a/scipost/templates/scipost/Fellow_activity_overview.html
+++ b/scipost/templates/scipost/Fellow_activity_overview.html
@@ -59,7 +59,10 @@
<ul class="list-group list-group-flush">
{% for assignment in assignments_ongoing %}
<li class="list-group-item">
- {% include 'submissions/_submission_card_contributor_content.html' with submission=assignment.submission %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=assignment.submission %}
+ {% include 'submissions/_submission_status_block.html' with submission=assignment.submission %}
+ </div>
</li>
{% empty %}
<li class="list-group-item">No completed assignments</li>
@@ -75,7 +78,10 @@
<ul class="list-group list-group-flush">
{% for assignment in assignments_completed %}
<li class="list-group-item">
- {% include 'submissions/_submission_card_contributor_content.html' with submission=assignment.submission %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=assignment.submission %}
+ {% include 'submissions/_submission_status_block.html' with submission=assignment.submission %}
+ </div>
</li>
{% empty %}
<li class="list-group-item">No completed assignments</li>
diff --git a/scipost/templates/scipost/_public_info_as_table.html b/scipost/templates/scipost/_public_info_as_table.html
index 964e8098875162e47bc4b1fa7a16f1687b1b29cf..e41461ee178b3bdd9e01b9b0ba92804abf6b04ca 100644
--- a/scipost/templates/scipost/_public_info_as_table.html
+++ b/scipost/templates/scipost/_public_info_as_table.html
@@ -2,9 +2,8 @@
<tr><td>Title: </td><td> </td><td>{{ contributor.get_title_display }}</td></tr>
<tr><td>First name: </td><td> </td><td>{{ contributor.user.first_name }}</td></tr>
<tr><td>Last name: </td><td> </td><td>{{ contributor.user.last_name }}</td></tr>
- <tr><td>ORCID id: </td><td> </td><td>{{ contributor.orcid_id }}</td></tr>
- <tr><td>Country of employment: </td><td> </td>
- <td>{{ contributor.country_of_employment.name }}</td></tr>
- <tr><td>Affiliation: </td><td> </td><td>{{ contributor.affiliation }}</td></tr>
- <tr><td>Personal web page: </td><td> </td><td>{{ contributor.personalwebpage }}</td></tr>
+ <tr><td>ORCID id: </td><td> </td><td>{{ contributor.orcid_id|default:'-' }}</td></tr>
+ <tr><td>Country of employment: </td><td> </td><td>{{ contributor.country_of_employment.name|default:'-'}}</td></tr>
+ <tr><td>Affiliation: </td><td> </td><td>{{ contributor.affiliation|default:'-' }}</td></tr>
+ <tr><td>Personal web page: </td><td> </td><td>{{ contributor.personalwebpage|default:'-' }}</td></tr>
</table>
diff --git a/scipost/templates/scipost/claim_authorships.html b/scipost/templates/scipost/claim_authorships.html
index 8a774d4378e36742c6786cc783f4678f543d93c6..7a5144847a5e021d1f5abf766eada6fa3525dba7 100644
--- a/scipost/templates/scipost/claim_authorships.html
+++ b/scipost/templates/scipost/claim_authorships.html
@@ -58,7 +58,7 @@
<div class="col-12">
{% for sub in submission_authorships_to_claim %}
<div class="card">
- {% include 'submissions/_submission_card_content.html' with submission=sub %}
+ {% include 'partials/submissions/submission_card_content.html' with submission=sub %}
<div class="card-footer">
<form class="d-inline-block" action="{% url 'scipost:claim_sub_authorship' submission_id=sub.id claim=1 %}" method="post">
{% csrf_token %}
diff --git a/scipost/templates/scipost/contributor_info.html b/scipost/templates/scipost/contributor_info.html
index f97fa477386456fd5faf5ea437fee782e89043f8..7ee2c8988a5f5d791b97c4ff50740fd03d0968cf 100644
--- a/scipost/templates/scipost/contributor_info.html
+++ b/scipost/templates/scipost/contributor_info.html
@@ -37,7 +37,6 @@
{% endif %}
{% if contributor_submissions %}
- {# <hr>#}
<div class="row">
<div class="col-12">
<h2 class="highlight">Submissions <small><a href="javascript:;" class="ml-2" data-toggle="toggle" data-target="#mysubmissionslist">View/hide submissions</a></small></h2>
@@ -48,7 +47,9 @@
<ul class="list-group list-group-flush">
{% for sub in contributor_submissions %}
<li class="list-group-item">
- {% include 'submissions/_submission_card_content.html' with submission=sub %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=sub %}
+ </div>
</li>
{% endfor %}
</ul>
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index c5cc4d3b4c455618213d1fcdd9b1ac2e854e049e..36cd4a79dc0af6b6ad7844469e2327b0bf9d26b1 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -59,7 +59,9 @@
<ul class="list-group list-group-flush">
{% for submission in submissions %}
<li class="list-group-item">
- {% include 'submissions/_submission_card_content_sparse.html' with submission=submission %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content_homepage.html' with submission=submission %}
+ </div>
</li>
{% endfor %}
<li class="list-group-item">
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 817781a380fe7627a9a44e130de212d7dd8713c5..19522be6222256824b92c3703e6088d23d5ef881 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -415,7 +415,11 @@
<ul class="list-group list-group-flush">
{% for assignment in active_assignments %}
<li class="list-group-item">
- {% include 'submissions/_submission_card_eic_content.html' with submission=assignment.submission %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=assignment.submission %}
+ {% include 'submissions/_submission_status_block.html' with submission=assignment.submission %}
+ <p class="card-text mt-2">Manage this Submission from its <a href="{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a>.</p>
+ </div>
</li>
{% endfor %}
</ul>
@@ -493,7 +497,9 @@
<ul class="list-group list-group-flush">
{% for task in pending_ref_tasks %}
<li class="list-group-item">
- {% include 'submissions/_refereeing_invitation_card_content.html' with invitation=task %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/refereeing_invitation_card_content.html' with invitation=task %}
+ </div>
</li>
{% empty %}
<li class="list-group-item"><em>You do not have any pending refereeing task</em></li>
@@ -511,8 +517,10 @@
<ul class="list-group list-group-flush">
{% for report in contributor.reports.in_draft.all %}
<li class="list-group-item">
- <div class="w-100">{% include 'submissions/_submission_card_content.html' with submission=report.submission %}</div>
- <div class="px-2 mb-2"><a class="px-1" href="{% url 'submissions:submit_report' report.submission.arxiv_identifier_w_vn_nr %}">Finish report</a></div>
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=report.submission %}
+ <a class="btn btn-outline-primary my-2" href="{% url 'submissions:submit_report' report.submission.arxiv_identifier_w_vn_nr %}">Finish report</a>
+ </div>
</li>
{% endfor %}
</ul>
@@ -532,7 +540,7 @@
{% 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 {% block cardblock_class_block %}{% endblock %}">
+ <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>
@@ -586,7 +594,21 @@
<ul class="list-group list-group-flush">
{% for sub in own_submissions %}
<li class="list-group-item">
- {% include 'submissions/_submission_card_author_content.html' with submission=sub current_user=request.user %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=sub %}
+ {% include 'submissions/_submission_status_block.html' with submission=sub %}
+
+ {% if request.user.contributor == sub.submitted_by %}
+ <p class="card-text mt-1">
+ {% if sub.editor_in_charge %}
+ <a href="{% url 'submissions:communication' sub.arxiv_identifier_w_vn_nr 'AtoE' %}">Write to the Editor-in-charge</a>
+ {% endif %}
+ {% if sub.status == 'revision_requested' %}
+ · <a href="{% url 'submissions:prefill_using_identifier' %}?identifier={{ sub.arxiv_identifier_wo_vn_nr }}">Resubmit this manuscript</a>
+ {% endif %}
+ </p>
+ {% endif %}
+ </div>
</li>
{% empty %}
<li class="list-group-item">
diff --git a/scipost/templates/scipost/vet_authorship_claims.html b/scipost/templates/scipost/vet_authorship_claims.html
index b22cb86df6c58e67e4b916efa33a435e0e6557c6..fb805bc4c09ce55ad6a0f68dfb544939d922117f 100644
--- a/scipost/templates/scipost/vet_authorship_claims.html
+++ b/scipost/templates/scipost/vet_authorship_claims.html
@@ -42,7 +42,7 @@
<h4>Contributor {{ claim.claimant.user.first_name }} {{ claim.claimant.user.last_name }} claims to be an author of Submission:</h4>
</div>
<div class="card-body">
- {% include 'submissions/_submission_card_content.html' with submission=claim.submission %}
+ {% include 'partials/submissions/submission_card_content.html' with submission=claim.submission %}
</div>
{% elif claim.commentary %}
<div class="card-header">
diff --git a/submissions/templates/partials/submissions/pool/submission_details.html b/submissions/templates/partials/submissions/pool/submission_details.html
index 28140d19272a34b017e5be0a57e12908c10af62e..770936a3dfb2bd08e486a1633e606d8058c36120 100644
--- a/submissions/templates/partials/submissions/pool/submission_details.html
+++ b/submissions/templates/partials/submissions/pool/submission_details.html
@@ -12,7 +12,9 @@
<a href="javascript:;" class="d-inline-block px-3" data-toggle="hide" data-target="#container_{{ submission.id }}">Hide details <i class="fa fa-angle-up text-blue" aria-hidden="true"></i></a>
</div>
- {% include 'submissions/_submission_card_fellow_content.html' with submission=submission hide_title=1 cardblock_class='px-0 pt-0' %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=submission %}
+ </div>
<div>
<h3>Remarks on this submission:</h3>
diff --git a/submissions/templates/partials/submissions/pool/submission_info_table.html b/submissions/templates/partials/submissions/pool/submission_info_table.html
new file mode 100644
index 0000000000000000000000000000000000000000..62ae68a23c23a9f5d0826dc998502880cbfa4c8d
--- /dev/null
+++ b/submissions/templates/partials/submissions/pool/submission_info_table.html
@@ -0,0 +1,84 @@
+<table class="w-100 mb-1">
+ <tr>
+ <td style="min-width: 40%;">Version</td>
+ <td>{{submission.arxiv_vn_nr}} ({% if submission.is_current %}current version{% else %}deprecated version {{submission.arxiv_vn_nr}}{% endif %})</td>
+ </tr>
+ <tr>
+ <td>Submitted</td>
+ <td>{{submission.submission_date}} to {{submission.get_submitted_to_journal_display}}</td>
+ </tr>
+
+ {% if submission.acceptance_date %}
+ <tr>
+ <td>Accepted</td>
+ <td>{{submission.acceptance_date}}</td>
+ </tr>
+ {% endif %}
+
+ <tr>
+ <td>Latest activity</td>
+ <td>{{submission.latest_activity}}</td>
+ </tr>
+ <tr>
+ <td>Editor-in-charge</td>
+ <td>
+ {% if submission.editor_in_charge %}
+ {{ submission.editor_in_charge }}
+ {% elif perms.scipost.can_assign_submissions %}
+ <a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a new assignment request</a>
+ {% else %}
+ <strong class="text-danger">You can volunteer to become Editor-in-charge by <a href="{% url 'submissions:volunteer_as_EIC' submission.arxiv_identifier_w_vn_nr %}">clicking here</a>.</strong>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td>Status</td>
+ <td>{{ submission.get_status_display }}</td>
+ </tr>
+ <tr>
+ <td>Refereeing cycle</td>
+ <td>{{ submission.get_refereeing_cycle_display }}</td>
+ </tr>
+
+ {% include 'partials/submissions/refereeing_status_as_tr.html' with submission=submission %}
+
+ <tr>
+ <td>Comments</td>
+ <td>
+ {{submission.comments.vetted.count}}
+ <small><span class="fa fa-info-circle" data-toggle="tooltip" data-placement='bottom' data-html="true" title="{{submission.comments.regular_comments.vetted.count}} comments<br>{{submission.comments.author_replies.vetted.count}} author replies<hr>{{submission.comments.awaiting_vetting.count}} awaiting vetting"></span></small>
+ </td>
+ </tr>
+
+ <tr>
+ <td>Reporting deadline</td>
+ <td>
+ {% if submission.reporting_deadline > now %}
+ in {{ submission.reporting_deadline|timeuntil }}
+ {% else %}
+ {{ submission.reporting_deadline|timesince }} ago
+ {% endif %}
+ </td>
+ </tr>
+
+ {% if perms.scipost.can_do_plagiarism_checks %}
+ <tr>
+ <td>Plagiarism score</td>
+ <td>
+ {% if submission.plagiarism_report %}
+ {{ submission.plagiarism_report.score }}%
+ {% else %}
+ <a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Run plagiarism check</a>
+ {% endif %}
+ </td>
+ </tr>
+ {% endif %}
+
+ {% if perms.scipost.can_manage_college_composition %}
+ <tr>
+ <td>Pool composition</td>
+ <td><a href="{% url 'colleges:submission' submission.arxiv_identifier_w_vn_nr %}">{{ submission.fellows.count }} Fellowships</a></td>
+ </tr>
+ {% endif %}
+
+</table>
diff --git a/submissions/templates/partials/submissions/refereeing_invitation_card_content.html b/submissions/templates/partials/submissions/refereeing_invitation_card_content.html
new file mode 100644
index 0000000000000000000000000000000000000000..cb77fb4d0f8ffe69b5377d2685b4be0e94e4ceea
--- /dev/null
+++ b/submissions/templates/partials/submissions/refereeing_invitation_card_content.html
@@ -0,0 +1,8 @@
+
+<h3 class="card-title">{% if invitation.submission.reporting_deadline_has_passed %}<span class="label label-sm label-danger mr-2">overdue</span> {% endif %}{{ invitation.submission }}</h3>
+<h4 class="card-subtitle text-muted">due: {{ invitation.submission.reporting_deadline }}</h4>
+
+<div class="d-block">
+ <a class="d-inline-block" href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=invitation.submission.arxiv_identifier_w_vn_nr %}">Submit your Report</a> <span class="text-blue">|</span>
+ <a class="d-inline-block" href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=invitation.submission.arxiv_identifier_w_vn_nr comtype='RtoE' referee_id=request.user.contributor.id %}">Write to the Editor-in-charge</a>.
+</div>
diff --git a/submissions/templates/partials/submissions/search_card.html b/submissions/templates/partials/submissions/search_card.html
index 537ed070cd91eafa4186ada284e3c42247bf5b91..b6dfe91e6dd92b576be2f3b4ce07c8b1f4388df1 100644
--- a/submissions/templates/partials/submissions/search_card.html
+++ b/submissions/templates/partials/submissions/search_card.html
@@ -1 +1,3 @@
-{% extends 'submissions/_submission_card_content.html' %}
+<div class="card-body px-0">
+ {% extends 'partials/submissions/submission_card_content.html' %}
+</div>
diff --git a/submissions/templates/partials/submissions/submission_card_content.html b/submissions/templates/partials/submissions/submission_card_content.html
new file mode 100644
index 0000000000000000000000000000000000000000..aa9128c75d3e9ac2f5ff0e87f181f13e5c4bcceb
--- /dev/null
+++ b/submissions/templates/partials/submissions/submission_card_content.html
@@ -0,0 +1,13 @@
+{% include 'partials/submissions/submission_title.html' with submission=submission %}
+
+{% block card_footer %}
+ <p class="text-muted mb-0">
+ Version {{ submission.arxiv_vn_nr }} ({% if submission.is_current %}current version{% else %}deprecated version {{ submission.arxiv_vn_nr }}{% endif %})
+ <br>
+ {% if submission.publication %}
+ Published as <a href="{{ submission.publication.get_absolute_url }}">{{ submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation }} <strong>{{ submission.publication.in_issue.in_volume.number }}</strong>, {{ submission.publication.get_paper_nr }} ({{ submission.publication.publication_date|date:'Y' }})</a>
+ {% else %}
+ Submitted {{ submission.submission_date }} to {{ submission.get_submitted_to_journal_display }}
+ {% endif %} · latest activity: {{ submission.latest_activity }}
+ </p>
+{% endblock %}
diff --git a/submissions/templates/partials/submissions/submission_card_content_homepage.html b/submissions/templates/partials/submissions/submission_card_content_homepage.html
new file mode 100644
index 0000000000000000000000000000000000000000..8a0ba52f29bbe99148348e51435ef6e926cfd1a8
--- /dev/null
+++ b/submissions/templates/partials/submissions/submission_card_content_homepage.html
@@ -0,0 +1,7 @@
+{% extends 'partials/submissions/submission_card_content.html' %}
+
+{% block card_footer %}
+ <div class="text-muted mb-0">
+ Submitted {{submission.submission_date}} to {{submission.get_submitted_to_journal_display}}</span>
+ </div>
+{% endblock %}
diff --git a/submissions/templates/partials/submissions/submission_title.html b/submissions/templates/partials/submissions/submission_title.html
new file mode 100644
index 0000000000000000000000000000000000000000..8545ab7f5dbc8a51a5521c6139ad7f24183deb04
--- /dev/null
+++ b/submissions/templates/partials/submissions/submission_title.html
@@ -0,0 +1,7 @@
+<div class="submission_title">
+ <h5 class="pb-0 subject_area">{{ submission.get_subject_area_display }}</h5>
+ <h3 class="card-title mb-0 submisssion_title">
+ <a href="{{ submission.get_absolute_url }}">{{ submission.title }}</a>
+ </h3>
+ <p class="mb-3 author_list">by {{ submission.author_list }}</p>
+</div>
diff --git a/submissions/templates/submissions/_refereeing_invitation_card_content.html b/submissions/templates/submissions/_refereeing_invitation_card_content.html
deleted file mode 100644
index 383f50fd3d8ea650d0ed908efcce3e7ed7583f54..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_refereeing_invitation_card_content.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="card-body">
- <h3 class="card-title">{% if invitation.submission.reporting_deadline_has_passed %}<span class="label label-sm label-danger mr-2">overdue</span> {% endif %}{{ invitation.submission }}</h3>
- <h4 class="card-subtitle text-muted">due: {{ invitation.submission.reporting_deadline }}</h4>
-
- <div class="d-block">
- <a class="d-inline-block" href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=invitation.submission.arxiv_identifier_w_vn_nr %}">Submit your Report</a> <span class="text-blue">|</span>
- <a class="d-inline-block" href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=invitation.submission.arxiv_identifier_w_vn_nr comtype='RtoE' referee_id=request.user.contributor.id %}">Write to the Editor-in-charge</a>.
- </div>
-
-</div>
diff --git a/submissions/templates/submissions/_submission_card_author_content.html b/submissions/templates/submissions/_submission_card_author_content.html
deleted file mode 100644
index 1dabd69564b13275a5cc7742cbf8f826e3baeb2f..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_card_author_content.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'submissions/_submission_card_base.html' %}
-
-{% block card_block_footer %}
- {{block.super}}
- <p class="card-text">by {{submission.author_list}}</p>
- <p class="card-text text-muted">Version {{submission.arxiv_vn_nr}} ({% if submission.is_current %}current version{% else %}deprecated version {{submission.arxiv_vn_nr}}{% endif %})</p>
- <p class="card-text text-muted">Submitted {{submission.submission_date}} to {{submission.get_submitted_to_journal_display}} - latest activity: {{submission.latest_activity}}</p>
- <p class="card-text">Status: {{submission.get_status_display}}</p>
-
- {% if current_user and current_user.contributor == submission.submitted_by %}
- <p class="card-text">
- {% if submission.editor_in_charge %}
- <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='AtoE' %}">Write to the Editor-in-charge</a>
- {% endif %}
- {% if submission.status == 'revision_requested' %}
- · <a href="{% url 'submissions:prefill_using_identifier' %}?identifier={{submission.arxiv_identifier_wo_vn_nr}}">Resubmit this manuscript</a>
- {% endif %}
- </p>
- {% endif %}
-{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_content.html b/submissions/templates/submissions/_submission_card_content.html
deleted file mode 100644
index 900102bc98312f0c8e146a3c4c309d0a04dabfaa..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_card_content.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends 'submissions/_submission_card_base.html' %}
-
-{% block title_class_block %}mb-0{% endblock %}
-
-{% block card_block_footer %}
- {{block.super}}
- <p class="card-text mb-3">by {{submission.author_list}}</p>
- <p class="card-text text-muted">Version {{submission.arxiv_vn_nr}} ({% if submission.is_current %}current version{% else %}deprecated version {{submission.arxiv_vn_nr}}{% endif %})</p>
- <p class="card-text text-muted">
- {% if submission.publication %}
- Published as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a>
- {% else %}
- Submitted {{submission.submission_date}} to {{submission.get_submitted_to_journal_display}}
- {% endif %} · latest activity: {{submission.latest_activity}}</p>
-{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_content_sparse.html b/submissions/templates/submissions/_submission_card_content_sparse.html
deleted file mode 100644
index d90db974e82eb305e28193c5df4923e30c674dc6..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_card_content_sparse.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'submissions/_submission_card_base.html' %}
-
-{% block cardblock_class_block %}px-0{% endblock %}
-
-
-{% block card_block_footer %}
- {{block.super}}
- <div class="mt-0 mb-3">by {{submission.author_list}}</div>
- <div class="text-muted">
- <span class="d-inline-block">Submitted {{submission.submission_date}}</span>
- <span class="d-inline-block">to {{submission.get_submitted_to_journal_display}}</span>
- </div>
-{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_contributor_content.html b/submissions/templates/submissions/_submission_card_contributor_content.html
deleted file mode 100644
index 4f5b8fbe93eb705b4d1e3f6b7fc01315f7646fc7..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_card_contributor_content.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'submissions/_submission_card_base.html' %}
-
-{% block card_block_footer %}
- {{block.super}}
- <p class="card-text">by {{submission.author_list}}</p>
- <p class="card-text text-muted">Submitted {{submission.submission_date}} to {{submission.get_submitted_to_journal_display}}</p>
- <p class="card-text text-muted">Status: {{submission.get_status_display}}</p>
-{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_eic_content.html b/submissions/templates/submissions/_submission_card_eic_content.html
deleted file mode 100644
index 41d94af29220d1f0b69ec2e5db8b7edf75c070c1..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_card_eic_content.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'submissions/_submission_card_base.html' %}
-
-{% block card_block_footer %}
- {{block.super}}
- <p class="card-text text-muted">by {{submission.author_list}} (submitted {{submission.submission_date}} to {{submission.get_submitted_to_journal_display}})</p>
- <p class="card-text text-muted">Status: {{submission.get_status_display}}</p>
- <p class="card-text mt-2">Manage this Submission from its <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a>.</p>
-{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_fellow_content.html b/submissions/templates/submissions/_submission_card_fellow_content.html
deleted file mode 100644
index bbf4abf84b79b620a577f01a9acdbb2ed243beb8..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_card_fellow_content.html
+++ /dev/null
@@ -1,90 +0,0 @@
-{% extends 'submissions/_submission_card_base.html' %}
-
-{% block card_block_footer %}
- <p class="mb-3 author_list">by {{submission.author_list}}</p>
-
- <table class="text-muted w-100 mb-1">
- <tr>
- <td style="min-width: 40%;">Version</td>
- <td>{{submission.arxiv_vn_nr}} ({% if submission.is_current %}current version{% else %}deprecated version {{submission.arxiv_vn_nr}}{% endif %})</td>
- </tr>
- <tr>
- <td>Submitted</td>
- <td>{{submission.submission_date}} to {{submission.get_submitted_to_journal_display}}</td>
- </tr>
-
- {% if submission.acceptance_date %}
- <tr>
- <td>Accepted</td>
- <td>{{submission.acceptance_date}}</td>
- </tr>
- {% endif %}
-
- <tr>
- <td>Latest activity</td>
- <td>{{submission.latest_activity}}</td>
- </tr>
- <tr>
- <td>Editor-in-charge</td>
- <td>
- {% if submission.editor_in_charge %}
- {{ submission.editor_in_charge }}
- {% elif perms.scipost.can_assign_submissions %}
- <a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a new assignment request</a>
- {% else %}
- <strong class="text-danger">You can volunteer to become Editor-in-charge by <a href="{% url 'submissions:volunteer_as_EIC' submission.arxiv_identifier_w_vn_nr %}">clicking here</a>.</strong>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td>Status</td>
- <td>{{ submission.get_status_display }}</td>
- </tr>
- <tr>
- <td>Refereeing cycle</td>
- <td>{{ submission.get_refereeing_cycle_display }}</td>
- </tr>
-
- {% include 'partials/submissions/refereeing_status_as_tr.html' with submission=submission %}
-
- <tr>
- <td>Comments</td>
- <td>
- {{submission.comments.vetted.count}}
- <small><span class="fa fa-info-circle" data-toggle="tooltip" data-placement='bottom' data-html="true" title="{{submission.comments.regular_comments.vetted.count}} comments<br>{{submission.comments.author_replies.vetted.count}} author replies<hr>{{submission.comments.awaiting_vetting.count}} awaiting vetting"></span></small>
- </td>
- </tr>
-
- <tr>
- <td>Reporting deadline</td>
- <td>
- {% if submission.reporting_deadline > now %}
- in {{ submission.reporting_deadline|timeuntil }}
- {% else %}
- {{ submission.reporting_deadline|timesince }} ago
- {% endif %}
- </td>
- </tr>
-
- {% if perms.scipost.can_do_plagiarism_checks %}
- <tr>
- <td>Plagiarism score</td>
- <td>
- {% if submission.plagiarism_report %}
- {{ submission.plagiarism_report.score }}%
- {% else %}
- <a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Run plagiarism check</a>
- {% endif %}
- </td>
- </tr>
- {% endif %}
-
- {% if perms.scipost.can_manage_college_composition %}
- <tr>
- <td>Pool composition</td>
- <td><a href="{% url 'colleges:submission' submission.arxiv_identifier_w_vn_nr %}">{{ submission.fellows.count }} Fellowships</a></td>
- </tr>
- {% endif %}
-
- </table>
-{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_in_pool.html b/submissions/templates/submissions/_submission_card_in_pool.html
index d75435ceac00ea15807a6e43641fbe1e402986e8..cd69c1f89a6cc73f5e9862b197b9ccf7c96ef382 100644
--- a/submissions/templates/submissions/_submission_card_in_pool.html
+++ b/submissions/templates/submissions/_submission_card_in_pool.html
@@ -6,7 +6,12 @@
{% is_editor_in_charge request.user submission as is_editor_in_charge %}
{% is_edcol_admin request.user as is_editorial_admin %}
-{% include 'submissions/_submission_card_fellow_content.html' with submission=submission hide_title=1 %}
+{# !! TODO: Remove this template as soon as new pool in active !! #}
+
+<div class="card-body px-0">
+ {% include 'partials/submissions/submission_title.html' with submission=submission %}
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=submission %}
+</div>
<div class="card-body">
{% if submission.remarks.all %}
diff --git a/submissions/templates/submissions/admin/recommendation.html b/submissions/templates/submissions/admin/recommendation.html
index e40ed8c0d607cd2c7b64c1f19981d2a5bff09bd1..52bafd667d02290e165300a5758860e775937492 100644
--- a/submissions/templates/submissions/admin/recommendation.html
+++ b/submissions/templates/submissions/admin/recommendation.html
@@ -13,7 +13,8 @@
{% block content %}
<h1 class="highlight">Editorial Recommendation</h1>
- {% include 'submissions/_submission_card_fellow_content.html' with submission=object.submission %}
+ {% include 'partials/submissions/submission_title.html' with submission=object.submission %}
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=object.submission %}
<br>
{% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
diff --git a/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html b/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
index 2bfa56868b03435e2173d7a86be6077b7728a660..b317cf46f6df431693bd35a63ea3b953fdd6cfa8 100644
--- a/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
+++ b/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
@@ -14,7 +14,8 @@
<h1 class="highlight">Prepare Editorial Recommendation for Voting</h1>
-{% include 'submissions/_submission_card_fellow_content.html' with submission=recommendation.submission %}
+{% include 'partials/submissions/submission_title.html' with submission=recommendation.submission %}
+{% include 'partials/submissions/pool/submission_info_table.html' with submission=recommendation.submission %}
<br>
{% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
diff --git a/submissions/templates/submissions/communication.html b/submissions/templates/submissions/communication.html
index 345b299e194ebe8a1543145def237977e6e6b368..c360101c9daa43b362dacbe71b367380eddb6b22 100644
--- a/submissions/templates/submissions/communication.html
+++ b/submissions/templates/submissions/communication.html
@@ -29,7 +29,7 @@
</div>
</div>
-{% include 'submissions/_submission_card_content.html' with submission=submission %}
+{% include 'partials/submissions/submission_card_content.html' with submission=submission %}
<br>
<div class="row">
diff --git a/submissions/templates/submissions/pool.html b/submissions/templates/submissions/pool.html
index fc8fc6035dfd14d64e5edffb31f63077ed65cfe0..bff975019a340c0e7eb7964b8ca79aaa86994b4e 100644
--- a/submissions/templates/submissions/pool.html
+++ b/submissions/templates/submissions/pool.html
@@ -44,8 +44,11 @@
{% endif %}
<div class="col-12" id="undergoing_rec_{{rec.id}}">
- <div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ <div class="card">
+ <div class="card-body">
+ {% include 'partials/submissions/submission_title.html' with submission=rec.submission %}
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=rec.submission %}
+ </div>
</div>
<div class="card card-outline-secondary">
@@ -130,8 +133,11 @@
<div class="row">
<div class="col-12" id="prepare_rec_{{rec.id}}">
- <div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ <div class="card">
+ <div class="card-body">
+ {% include 'partials/submissions/submission_title.html' with submission=rec.submission %}
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=rec.submission %}
+ </div>
</div>
<div class="card card-outline-secondary">
@@ -184,8 +190,11 @@
<div class="row">
<div class="col-12">
- <div class="card card-outline-secondary">
- {% include 'submissions/_submission_card_fellow_content.html' with submission=rec.submission %}
+ <div class="card">
+ <div class="card-body">
+ {% include 'partials/submissions/submission_title.html' with submission=rec.submission %}
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=rec.submission %}
+ </div>
</div>
<div class="card card-outline-secondary">
diff --git a/submissions/templates/submissions/pool/assignments.html b/submissions/templates/submissions/pool/assignments.html
index c3602200ef5f7804af5aff7ee71a30ed38b2b4d0..73dfcb932ee00dbb41e9e8da8c19e13a37ee2f5f 100644
--- a/submissions/templates/submissions/pool/assignments.html
+++ b/submissions/templates/submissions/pool/assignments.html
@@ -25,7 +25,9 @@
<h1 class="highlight">Your current assignments:</h1>
{% for assignment in current_assignments %}
{% if not forloop.first %}<hr class="small">{% endif %}
- {% include 'submissions/_submission_card_fellow_content.html' with submission=assignment.submission %}
+
+ {% include 'partials/submissions/submission_title.html' with submission=assignment.submission %}
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=assignment.submission %}
{% include 'submissions/_required_actions_block.html' with submission=submission %}
<h4 class="d-block mt-2">
diff --git a/submissions/templates/submissions/pool/recommendation.html b/submissions/templates/submissions/pool/recommendation.html
index ef62f309a2ef42f741699998540a65663237af6f..bf84970079036e734701537e61e42182789945c5 100644
--- a/submissions/templates/submissions/pool/recommendation.html
+++ b/submissions/templates/submissions/pool/recommendation.html
@@ -12,7 +12,10 @@
{% block content %}
<h1>Editorial Recommendation to vote on</h1>
- {% include 'submissions/_submission_card_fellow_content.html' with submission=recommendation.submission %}
+
+ {% include 'partials/submissions/submission_title.html' with submission=recommendation.submission %}
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=recommendation.submission %}
+ <br>
{% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
<h3 class="mt-4">Your position on this recommendation</h3>
diff --git a/submissions/templates/submissions/submissions.html b/submissions/templates/submissions/submissions.html
index e257bc0782c9141b0e4e71fa6dde3aab5208193e..42aa6edd773874840173c4c7c46793bd7098fb77 100644
--- a/submissions/templates/submissions/submissions.html
+++ b/submissions/templates/submissions/submissions.html
@@ -69,7 +69,9 @@
<ul class="list-group list-group-flush">
{% for submission in object_list %}
<li class="list-group-item">
- {% include 'submissions/_submission_card_content.html' with submission=submission %}
+ <div class="card-body px-0">
+ {% include 'partials/submissions/submission_card_content.html' with submission=submission %}
+ </div>
</li>
{% endfor %}
</ul>