diff --git a/colleges/templates/colleges/fellowship_submission_remove.html b/colleges/templates/colleges/fellowship_submission_remove.html
index c5defe25aec8a8c6f7f2828fc603dbcecfedfa9b..4089e3b5eb455377d7fc08bee7ffb47da473f20d 100644
--- a/colleges/templates/colleges/fellowship_submission_remove.html
+++ b/colleges/templates/colleges/fellowship_submission_remove.html
@@ -16,7 +16,7 @@
<h2 class="text-primary">Fellowship {{ fellowship }}</h2>
<h3>Submission details</h3>
- {% include 'submissions/_submission_summary_short.html' with submission=submission %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission %}
<br>
<form method="post">
diff --git a/colleges/templates/colleges/fellowship_submission_remove_voting.html b/colleges/templates/colleges/fellowship_submission_remove_voting.html
index 837f1955a07c873134d63a767a177a1db28dea08..ea3d87fb3c0e4cf2005c925da85e353109d146d0 100644
--- a/colleges/templates/colleges/fellowship_submission_remove_voting.html
+++ b/colleges/templates/colleges/fellowship_submission_remove_voting.html
@@ -15,7 +15,7 @@
<h2 class="text-primary">Fellowship {{ fellowship }}</h2>
<h3>Submission details</h3>
- {% include 'submissions/_submission_summary_short.html' with submission=submission %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission %}
<br>
<form method="post">
diff --git a/colleges/templates/colleges/submission_add.html b/colleges/templates/colleges/submission_add.html
index e071c00b49bf87ae604544bc030a88a39680d426..3766e1133d5ab38542127461347cd2fe129c031e 100644
--- a/colleges/templates/colleges/submission_add.html
+++ b/colleges/templates/colleges/submission_add.html
@@ -14,7 +14,7 @@
<h1>Add Fellowship to Submission's Pool</h1>
<h2 class="text-primary">{{submission.title}}</h2>
<h3 class="mb-3">by {{submission.author_list}}</h3>
- {% include 'submissions/_submission_summary.html' with submission=submission hide_title=1 %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission hide_title=1 show_abstract=1 %}
<br>
<h3>Choose one of the following (active) Fellowships to add to the Pool:</h3>
diff --git a/colleges/templates/colleges/submission_add_for_voting.html b/colleges/templates/colleges/submission_add_for_voting.html
index 35338669f512ce63787f41bef781d4a37b929e2e..3ff38218314088b68dd08f4366c7891d9d0b2dee 100644
--- a/colleges/templates/colleges/submission_add_for_voting.html
+++ b/colleges/templates/colleges/submission_add_for_voting.html
@@ -14,7 +14,7 @@
<h1>Add Fellowship to Submission's Voting Fellows</h1>
<h2 class="text-primary">{{submission.title}}</h2>
<h3 class="mb-3">by {{submission.author_list}}</h3>
- {% include 'submissions/_submission_summary.html' with submission=submission hide_title=1 %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission hide_title=1 show_abstract=1 %}
<br>
<h3>Choose one of the following (active) Fellowships to add to the Submission's Voting Fellows:</h3>
diff --git a/colleges/templates/colleges/submission_pool.html b/colleges/templates/colleges/submission_pool.html
index 1b487dc58ba434d0d1b45f38888154d73703447d..3b81638e50b06d612e010fb35d0508fea721075e 100644
--- a/colleges/templates/colleges/submission_pool.html
+++ b/colleges/templates/colleges/submission_pool.html
@@ -13,7 +13,7 @@
<h1>Submission Pool Composition</h1>
<h2 class="text-primary">{{submission.title}}</h2>
<h3 class="mb-3">by {{submission.author_list}}</h3>
- {% include 'submissions/_submission_summary.html' with submission=submission hide_title=1 %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission hide_title=1 show_abstract=1 %}
<br>
<h3>Pool Composition</h3>
diff --git a/colleges/templates/colleges/submission_voting_fellows.html b/colleges/templates/colleges/submission_voting_fellows.html
index bfd44e8702f682ec40da09c67c6048cbe8d8dc85..619bdde69a44ce62940bcd7a1d1713ac940c3beb 100644
--- a/colleges/templates/colleges/submission_voting_fellows.html
+++ b/colleges/templates/colleges/submission_voting_fellows.html
@@ -13,7 +13,7 @@
<h1>Submission's Voting Fellows</h1>
<h2 class="text-primary">{{submission.title}}</h2>
<h3 class="mb-3">by {{submission.author_list}}</h3>
- {% include 'submissions/_submission_summary.html' with submission=submission hide_title=1 %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission hide_title=1 show_abstract=1 %}
<br>
<h3>Voting Fellows</h3>
diff --git a/comments/templates/comments/reply_to_report.html b/comments/templates/comments/reply_to_report.html
index 64f28db492efe048647f5a1f9453121ab297c793..8d9984ad077613e5a81db037921131f2107f3c53 100644
--- a/comments/templates/comments/reply_to_report.html
+++ b/comments/templates/comments/reply_to_report.html
@@ -18,12 +18,12 @@
{% else %}
<h2>The Submission concerned:</h2>
- {% include 'submissions/_submission_summary.html' with submission=report.submission %}
+ {% include 'partials/submissions/submission_summary.html' with submission=report.submission show_abstract=1 %}
</div>
</div>
- {% include 'submissions/_single_public_report_without_comments.html' with report=report %}
+ {% include 'partials/submissions/report_public_without_comments.html' with report=report %}
<div class="row">
<div class="col-12">
diff --git a/comments/templatetags/comment_extras.py b/comments/templatetags/comment_extras.py
index 5ae3d8261883134688183e76825356cf8ec0d209..704f018b3dcbc06cc1f0114f4d098965d06d0710 100644
--- a/comments/templatetags/comment_extras.py
+++ b/comments/templatetags/comment_extras.py
@@ -20,7 +20,7 @@ class CommentTemplateNode(template.Node):
def render(self, context):
content_object = self.content_object.resolve(context)
if isinstance(content_object, Submission):
- t = context.template.engine.get_template('submissions/_submission_summary_short.html')
+ t = context.template.engine.get_template('partials/submissions/submission_summary.html')
return t.render(template.Context({'submission': content_object}))
elif isinstance(content_object, Commentary):
t = context.template.engine.get_template('commentaries/_commentary_summary.html')
diff --git a/journals/factories.py b/journals/factories.py
index 8d8de8ee154b5922fe4f728ca37ef39f8e3accee..802dc70c73bd9ebd6ebe630e85adfb757de6a093 100644
--- a/journals/factories.py
+++ b/journals/factories.py
@@ -95,8 +95,7 @@ class PublicationFactory(factory.django.DjangoModelFactory):
# Authors
self.author_list = self.accepted_submission.author_list
- self.authors.add(*self.accepted_submission.authors.all())
- self.first_author = self.accepted_submission.authors.first()
+ # self.authors.add(*self.accepted_submission.authors.all())
self.authors_claims.add(*self.accepted_submission.authors_claims.all())
self.authors_false_claims.add(*self.accepted_submission.authors_false_claims.all())
diff --git a/journals/forms.py b/journals/forms.py
index 44462b752ef726690395007f2765d454a0e597fa..3f662b6def96920f7e8887e64c1602792e11e1b0 100644
--- a/journals/forms.py
+++ b/journals/forms.py
@@ -58,16 +58,19 @@ class CitationListBibitemsForm(forms.Form):
return dois
-class FundingInfoForm(forms.Form):
- funding_statement = forms.CharField(widget=forms.Textarea())
+class FundingInfoForm(forms.ModelForm):
+ funding_statement = forms.CharField(widget=forms.Textarea({
+ 'rows': 10,
+ 'placeholder': 'Paste the funding info statement here'
+ }))
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.fields['funding_statement'].widget.attrs.update({
- 'rows': 10,
- 'cols': 50,
- 'placeholder': 'Paste the funding info statement here'
- })
+ class Meta:
+ model = Publication
+ fields = ()
+
+ def save(self, *args, **kwargs):
+ self.instance.metadata['funding_statement'] = self.cleaned_data['funding_statement']
+ return super().save(*args, **kwargs)
class CreateMetadataXMLForm(forms.ModelForm):
@@ -77,10 +80,70 @@ class CreateMetadataXMLForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.fields['metadata_xml'].widget.attrs.update({
- 'rows': 50,
- 'cols': 50
- })
+ self.fields['metadata_xml'].widget.attrs.update({'rows': 50})
+
+
+class CreateMetadataDOAJForm(forms.ModelForm):
+ class Meta:
+ model = Publication
+ fields = ()
+
+ def __init__(self, *args, **kwargs):
+ self.request = kwargs.pop('request')
+ super().__init__(*args, **kwargs)
+
+ def save(self, *args, **kwargs):
+ self.instance.metadata_DOAJ = self.generate(self.instance)
+ return super().save(*args, **kwargs)
+
+ def generate(self, publication):
+ md = {
+ 'bibjson': {
+ 'author': [{'name': publication.author_list}],
+ 'title': publication.title,
+ 'abstract': publication.abstract,
+ 'year': publication.publication_date.strftime('%Y'),
+ 'month': publication.publication_date.strftime('%m'),
+ 'start_page': publication.get_paper_nr(),
+ 'identifier': [
+ {
+ 'type': 'eissn',
+ 'id': str(publication.in_issue.in_volume.in_journal.issn)
+ },
+ {
+ 'type': 'doi',
+ 'id': publication.doi_string
+ }
+ ],
+ 'link': [
+ {
+ 'url': self.request.build_absolute_uri(publication.get_absolute_url()),
+ 'type': 'fulltext',
+ }
+ ],
+ 'journal': {
+ 'publisher': 'SciPost',
+ 'volume': str(publication.in_issue.in_volume.number),
+ 'number': str(publication.in_issue.number),
+ 'identifier': [{
+ 'type': 'eissn',
+ 'id': str(publication.in_issue.in_volume.in_journal.issn)
+ }],
+ 'license': [
+ {
+ 'url': self.request.build_absolute_uri(
+ publication.in_issue.in_volume.in_journal.get_absolute_url()),
+ 'open_access': 'true',
+ 'type': publication.get_cc_license_display(),
+ 'title': publication.get_cc_license_display(),
+ }
+ ],
+ 'language': ['EN'],
+ 'title': publication.in_issue.in_volume.in_journal.get_name_display(),
+ }
+ }
+ }
+ return md
class BaseReferenceFormSet(BaseModelFormSet):
diff --git a/journals/migrations/0013_auto_20180216_0850.py b/journals/migrations/0013_auto_20180216_0850.py
new file mode 100644
index 0000000000000000000000000000000000000000..15e86e0e3936a6f1715cec3480a31e601bd52914
--- /dev/null
+++ b/journals/migrations/0013_auto_20180216_0850.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-02-16 07:50
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0012_auto_20180212_1950'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='publication',
+ name='authors_old',
+ ),
+ migrations.RemoveField(
+ model_name='publication',
+ name='authors_unregistered_old',
+ ),
+ migrations.RemoveField(
+ model_name='publication',
+ name='first_author',
+ ),
+ migrations.RemoveField(
+ model_name='publication',
+ name='first_author_unregistered',
+ ),
+ ]
diff --git a/journals/models.py b/journals/models.py
index 41cd2052cc1ad1bdaba0b9852ff8219190edc51e..31c9cdc87eec453db0c84da6cf35349172b8c8ee 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -290,12 +290,6 @@ class Publication(models.Model):
'publication',
'unregistered_author'),
related_name='publications')
- first_author = models.ForeignKey('scipost.Contributor', blank=True, null=True,
- on_delete=models.CASCADE,
- related_name='first_author_publications')
- first_author_unregistered = models.ForeignKey('journals.UnregisteredAuthor', blank=True, null=True,
- on_delete=models.CASCADE,
- related_name='first_author_publications')
authors_claims = models.ManyToManyField('scipost.Contributor', blank=True,
related_name='claimed_publications')
authors_false_claims = models.ManyToManyField('scipost.Contributor', blank=True,
@@ -328,12 +322,6 @@ class Publication(models.Model):
latest_metadata_update = models.DateTimeField(blank=True, null=True)
latest_activity = models.DateTimeField(default=timezone.now)
- # Deprecated fields. About to be removed after successful database migration on production.
- authors_old = models.ManyToManyField('scipost.Contributor', blank=True,
- related_name='publications_old')
- authors_unregistered_old = models.ManyToManyField('journals.UnregisteredAuthor', blank=True,
- related_name='publications_old')
-
objects = PublicationQuerySet.as_manager()
def __str__(self):
diff --git a/journals/templates/journals/add_author.html b/journals/templates/journals/add_author.html
index b49a3a0408821feaf3c8ddcc5ca28cb7e9dc1e94..668919333f224cee185775fc77edd28e4510821e 100644
--- a/journals/templates/journals/add_author.html
+++ b/journals/templates/journals/add_author.html
@@ -60,7 +60,7 @@
{% for contributor in contributors_found %}
<li>
<div class="font-weight-bold">{{ contributor.user.first_name }} {{ contributor.user.last_name }}</div>
- <a href="{% url 'journals:add_author' publication_id=publication.id contributor_id=contributor.id %}">Add this Contributor as author of this Publication</a>
+ <a href="{% url 'journals:add_author' doi_label=publication.doi_label contributor_id=contributor.id %}">Add this Contributor as author of this Publication</a>
</li>
{% empty %}
<li><span class="text-danger">No Contributor with this name could be identified.</span></li>
@@ -68,7 +68,7 @@
</ul>
<h3>You can otherwise add the author manually and link it to the publication</h3>
- <form action="{% url 'journals:add_author' publication_id=publication.id %}" method="post">
+ <form action="{% url 'journals:add_author' doi_label=publication.doi_label %}" method="post">
{% csrf_token %}
{{ form|bootstrap }}
<input class="btn btn-primary" type="submit" value="Add">
diff --git a/journals/templates/journals/create_citation_list_metadata.html b/journals/templates/journals/create_citation_list_metadata.html
index 637c12a0b10145671a88bede2d81522ed7fa8da0..c6f5f6d5f79e130b4ed33a83ce96a1371c370480 100644
--- a/journals/templates/journals/create_citation_list_metadata.html
+++ b/journals/templates/journals/create_citation_list_metadata.html
@@ -7,9 +7,8 @@
<div class="container">
<nav class="breadcrumb hidden-sm-down">
<a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <a href="{% url 'journals:manage_metadata' %}" class="breadcrumb-item">Administration</a>
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="breadcrumb-item">{{ publication.citation }}</a>
<span class="breadcrumb-item active">Create citation list metadata</span>
</nav>
</div>
@@ -22,27 +21,24 @@
<div class="row">
<div class="col-12">
- <h1 class="highlight">Create citation list metadata page</h1>
+ <h1 class="highlight">Create citation list metadata page for <a href="{{ publication.get_absolute_url }}">{{ publication.doi_label }}</a></h1>
</div>
</div>
<div class="row">
<div class="col-12">
- {% if errormessage %}
- <h2 class="text-danger">{{ errormessage }}</h2>
- {% endif %}
-
<form action="{% url 'journals:create_citation_list_metadata' publication.doi_label %}" method="post">
{% csrf_token %}
{{ bibitems_form|bootstrap }}
- <input type="submit" class="btn btn-secondary" value="Submit">
+ <input type="submit" class="btn btn-primary" value="Submit">
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="ml-3 btn btn-link">Back to Admin for {{ publication.doi_label }}</a>
</form>
- <hr>
+ <hr class="divider">
<h3>Current citation list metadata:</h3>
- <table>
+ <table class="table">
{% for citation in citation_list %}
<tr>
<td>{{ citation.key }}</td><td>{{ citation.doi }}</td>
@@ -52,7 +48,7 @@
<hr>
- <h3>Once you're happy with this metadata, you can <a href="{{publication.get_absolute_url}}">return to the publication's page</a> or to the <a href="{% url 'journals:manage_metadata' %}">metadata management page</a> or to <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}">this publication's metadata management page</a></h3>
+ <p>Once you're happy with this metadata, you can <a href="{{publication.get_absolute_url}}">return to the publication's page</a> or to the <a href="{% url 'journals:manage_metadata' %}">metadata management page</a> or to <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}">this publication's metadata management page</a></p>
</div>
</div>
diff --git a/journals/templates/journals/create_funding_info_metadata.html b/journals/templates/journals/create_funding_info_metadata.html
index 3f5d9921bae52166335fbc2eb80f4f4d7f3180ba..2373370f7b3d9ca053ec85ace517e5e520b3e775 100644
--- a/journals/templates/journals/create_funding_info_metadata.html
+++ b/journals/templates/journals/create_funding_info_metadata.html
@@ -7,9 +7,8 @@
<div class="container">
<nav class="breadcrumb hidden-sm-down">
<a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <a href="{% url 'journals:manage_metadata' %}" class="breadcrumb-item">Administration</a>
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="breadcrumb-item">{{ publication.citation }}</a>
<span class="breadcrumb-item active">Create funding info metadata</span>
</nav>
</div>
@@ -22,7 +21,7 @@
<div class="row">
<div class="col-12">
- <h1 class="highlight">Create funding info metadata page</h1>
+ <h1 class="highlight">Create funding info metadata page for <a href="{{ publication.get_absolute_url }}">{{ publication.doi_label }}</a></h1>
</div>
</div>
@@ -34,19 +33,20 @@
<h2 class="text-danger">{{ errormessage }}</h2>
{% endif %}
- <form action="{% url 'journals:create_funding_info_metadata' publication.doi_label %}" method="post">
+ <form method="post">
{% csrf_token %}
{{ funding_info_form|bootstrap }}
- <input type="submit" class="btn btn-secondary" value="Submit">
+ <input type="submit" class="btn btn-primary" value="Submit">
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="ml-3 btn btn-link">Back to Admin for {{ publication.doi_label }}</a>
</form>
- <hr>
- <h3 class="mt-3">Current funding info metadata:</h3>
- <p>{{funding_statement|linebreaks}}</p>
+ <hr class="divider">
+ <h3>Current funding info metadata:</h3>
+ <p>{{ funding_statement|linebreaksbr }}</p>
<hr>
- <h3>Once you're happy with this metadata, you can <a href="{{publication.get_absolute_url}}">return to the publication's page</a> or to the <a href="{% url 'journals:manage_metadata' %}">metadata management page</a> or to <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}">this publication's metadata management page</a></h3>
+ <p class="mb-0">Once you're happy with this metadata, you can <a href="{{publication.get_absolute_url}}">return to the publication's page</a> or to the <a href="{% url 'journals:manage_metadata' %}">metadata management page</a> or to <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}">this publication's metadata management page</a></p>
</div>
</div>
diff --git a/journals/templates/journals/create_metadata_xml.html b/journals/templates/journals/create_metadata_xml.html
index c99b48c8a289197ee1f1ffda7f77eec19e1ca6de..a6627c2567926544804cc917b2105849d0ee91b6 100644
--- a/journals/templates/journals/create_metadata_xml.html
+++ b/journals/templates/journals/create_metadata_xml.html
@@ -7,9 +7,8 @@
<div class="container">
<nav class="breadcrumb hidden-sm-down">
<a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <a href="{% url 'journals:manage_metadata' %}" class="breadcrumb-item">Administration</a>
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="breadcrumb-item">{{ publication.citation }}</a>
<span class="breadcrumb-item active">Create metadata XML</span>
</nav>
</div>
@@ -35,17 +34,17 @@
<form action="{% url 'journals:create_metadata_xml' publication.doi_label %}" method="post">
{% csrf_token %}
{{ create_metadata_xml_form|bootstrap }}
- <input type="submit" class="btn btn-secondary" value="Accept the metadata">
+ <input type="submit" class="btn btn-primary" value="Accept the metadata">
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="ml-3 btn btn-link">Back to Admin for {{ publication.doi_label }}</a>
</form>
- <hr class="hr6"/>
+ <hr class="divider">
- <h3>Current metadata xml:</h3>
- <div>
- <pre><code>{{ publication.metadata_xml|linebreaksbr }}</code></pre>
- </div>
-
- <h3>Once you're happy with this metadata, you can <a href="{{publication.get_absolute_url}}">return to the publication's page</a> or to the <a href="{% url 'journals:manage_metadata' %}">metadata management page</a></h3>
+ <h3>Current metadata xml</h3>
+ <br>
+ <pre><code>{{ publication.metadata_xml|linebreaksbr }}</code></pre>
+ <br>
+ <p class="mb-0">Once you're happy with this metadata, you can <a href="{{publication.get_absolute_url}}">return to the publication's page</a> or to the <a href="{% url 'journals:manage_metadata' %}">metadata management page</a></p>
</div>
</div>
diff --git a/journals/templates/journals/manage_metadata.html b/journals/templates/journals/manage_metadata.html
index 0b0547b47c5be8f52046bbf7b3036ac80089d857..fc3c61d69d847dd2b23a96a8daaf7722bc7514bb 100644
--- a/journals/templates/journals/manage_metadata.html
+++ b/journals/templates/journals/manage_metadata.html
@@ -74,16 +74,16 @@ event: "focusin"
<div class="row">
<div class="col-md-5">
<ul>
- <li>Mark the first author (currently: {% if publication.first_author %}{{ publication.first_author }}{% elif publication.first_author_unregistered %}{{ publication.first_author_unregistered }} (unregistered){% endif %})
+ <li>Mark the first author
<ul class="list-unstyled pl-4">
{% for author in publication.authors.all %}
<li>
- {{ author.order }}. <a href="{% url 'journals:mark_first_author' publication_id=publication.id author_object_id=author.id %}">{{ author }}</a>
+ {{ author.order }}. <a href="{% url 'journals:mark_first_author' doi_label=publication.doi_label author_object_id=author.id %}">{{ author }}</a>
</li>
{% endfor %}
</ul>
</li>
- <li><a href="{% url 'journals:add_author' publication.id %}">Add a missing author</a></li>
+ <li><a href="{% url 'journals:add_author' doi_label=publication.doi_label %}">Add a missing author</a></li>
<li><a href="{% url 'journals:create_citation_list_metadata' publication.doi_label %}">Create/update citation list metadata</a></li>
<li><a href="{% url 'journals:create_funding_info_metadata' publication.doi_label %}">Create/update funding info metadata</a></li>
diff --git a/journals/templates/journals/metadata_doaj_create.html b/journals/templates/journals/metadata_doaj_create.html
new file mode 100644
index 0000000000000000000000000000000000000000..5702c8deeba546e5181cbb1e9aa5c8ad9ccb35c5
--- /dev/null
+++ b/journals/templates/journals/metadata_doaj_create.html
@@ -0,0 +1,49 @@
+{% extends 'scipost/base.html' %}
+
+{% load bootstrap %}
+
+{% block pagetitle %}: Produce metadata DOAJ{% endblock pagetitle %}
+
+{% block breadcrumb %}
+ <div class="container-outside header">
+ <div class="container">
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <a href="{% url 'journals:manage_metadata' %}" class="breadcrumb-item">Administration</a>
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="breadcrumb-item">{{ publication.citation }}</a>
+ <span class="breadcrumb-item active">Produce metadata DOAJ</span>
+ </nav>
+ </div>
+ </div>
+{% endblock %}
+
+{% block content %}
+
+
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Produce metadata DOAJ for <a href="{{ publication.get_absolute_url }}">{{ publication.doi_label }}</a></h1>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ <h3>Existing DOAJ metadata</h3>
+ {% if publication.metadata_DOAJ %}
+ <pre><code>{{ publication.metadata_DOAJ }}</code></pre>
+ {% else %}
+ <p>No existing DOAJ Metadata found.</p>
+ {% endif %}
+
+ <br>
+ <form method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input class="btn btn-primary" type="submit" value="{% if publication.metadata_DOAJ %}Reproduce{% else %}Produce{% endif %}">
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="ml-3 btn btn-link">Back to Admin for {{ publication.doi_label }}</a>
+ </form>
+ </div>
+</div>
+
+
+{% endblock %}
diff --git a/journals/templates/journals/metadata_xml_deposit.html b/journals/templates/journals/metadata_xml_deposit.html
index 0f40882d3e4f459ebd331fc81fcf12d3a708f4e8..960e3737b67c6a3036eb52c7d1d9b177b94967a2 100644
--- a/journals/templates/journals/metadata_xml_deposit.html
+++ b/journals/templates/journals/metadata_xml_deposit.html
@@ -7,9 +7,8 @@
<div class="container">
<nav class="breadcrumb hidden-sm-down">
<a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
- <a href="{{publication.in_issue.in_volume.in_journal.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.in_volume.in_journal}}</a>
- <a href="{{publication.in_issue.get_absolute_url}}" class="breadcrumb-item">{{publication.in_issue.short_str}}</a>
- <a href="{{publication.get_absolute_url}}" class="breadcrumb-item">{{publication.citation}}</a>
+ <a href="{% url 'journals:manage_metadata' %}" class="breadcrumb-item">Administration</a>
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="breadcrumb-item">{{ publication.citation }}</a>
<span class="breadcrumb-item active">Metadata XML deposit</span>
</nav>
</div>
@@ -25,29 +24,35 @@
</div>
</div>
+{% if valid %}
+ <div class="row">
+ <div class="col-12">
-<div class="row">
- <div class="col-12">
-
- {% if errormessage %}
- <h2 class="text-danger">{{ errormessage }}</h2>
- {% endif %}
-
- <h3 class="my-1">Response headers:</h3>
- <div>
- <pre><code>{{ response_headers|linebreaks }}</code></pre>
- </div>
+ <h3 class="my-1">Response headers:</h3>
+ <pre><code>{{ response_headers|linebreaks }}</code></pre>
- <h3 class="mt-3">Response text:</h3>
- <div>
- <pre><code>{{ response_text|linebreaks }}</code></pre>
- </div>
+ <h3 class="mt-3">Response text:</h3>
+ <pre><code>{{ response_text|linebreaks }}</code></pre>
- <h3><a href="{{publication.get_absolute_url}}">return to the publication's page</a>, to the <a href="{% url 'journals:manage_metadata' %}">general metadata management page</a> or to <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}">this publication's metadata management page</a></h3>
+ <br>
+ <p><a href="{{publication.get_absolute_url}}">return to the publication's page</a>, to the <a href="{% url 'journals:manage_metadata' %}">general metadata management page</a> or to <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}">this publication's metadata management page</a></p>
+ </div>
</div>
-</div>
+{% else %}
+ <div class="row">
+ <div class="col-12">
+ <p>
+ <span class="text-danger">The metadata file for this metadata timestamp already exists.</span><br>
+ You might want to <a href="{% url 'journals:create_metadata_xml' doi_label=publication.doi_label %}">produce new metadata</a> to do a new deposit instead.
+ <p>
+
+ <br>
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}">Back to Admin for {{ publication.doi_label }}</a>
+ </div>
+ </div>
+{% endif %}
{% endblock %}
diff --git a/journals/templates/journals/publication_detail.html b/journals/templates/journals/publication_detail.html
index 358a8bbca484f3651103a84b22d9df4e010f28b9..1522969e8df4a5fd4fd4940b92cd7d863b92509a 100644
--- a/journals/templates/journals/publication_detail.html
+++ b/journals/templates/journals/publication_detail.html
@@ -134,16 +134,16 @@
<h3>Editorial Administration tools: </h3>
<ul>
<li>
- Mark the first author (currently: {% if publication.first_author %}{{ publication.first_author }}{% elif publication.first_author_unregistered %}{{ publication.first_author_unregistered }} (unregistered){% endif %})
+ Mark the first author
<ul class="list-unstyled pl-4">
{% for author in publication.authors.all %}
<li>
- {{ author.order }}. <a href="{% url 'journals:mark_first_author' publication_id=publication.id author_object_id=author.id %}">{{ author }}</a>
+ {{ author.order }}. <a href="{% url 'journals:mark_first_author' doi_label=publication.doi_label author_object_id=author.id %}">{{ author }}</a>
</li>
{% endfor %}
</ul>
</li>
- <li><a href="{% url 'journals:add_author' publication.id %}">Add a missing author</a></li>
+ <li><a href="{% url 'journals:add_author' doi_label=publication.doi_label %}">Add a missing author</a></li>
<li><a href="{% url 'journals:create_citation_list_metadata' publication.doi_label %}">Create/update citation list metadata</a></li>
<li><a href="{% url 'journals:create_funding_info_metadata' publication.doi_label %}">Create/update funding info metadata</a></li>
<li><a href="{% url 'journals:create_metadata_xml' publication.doi_label %}">Create/update the XML metadata</a></li>
diff --git a/journals/templates/journals/sign_existing_report.html b/journals/templates/journals/sign_existing_report.html
index 422659cd787f3887bd2c3ca8d230a118a83a33f1..95d198d9a267399052d7b459f7044a1037410bb5 100644
--- a/journals/templates/journals/sign_existing_report.html
+++ b/journals/templates/journals/sign_existing_report.html
@@ -42,7 +42,7 @@
<div class="row">
<div class="col-12">
<h3>Report on Submission <a href="{{report.submission.get_absolute_url}}">{{report.submission.title}}</a></h3>
- {% include 'submissions/_single_public_report_without_comments.html' with report=report user=request.user perms=perms %}
+ {% include 'partials/submissions/report_public_without_comments.html' with report=report user=request.user perms=perms %}
</div>
</div>
diff --git a/journals/urls/general.py b/journals/urls/general.py
index c57c961fd9e4985efee6e2e2b7fc310190e2547c..ca60342a93f2fb64dbd834e5fbe14fb8a7f44b56 100644
--- a/journals/urls/general.py
+++ b/journals/urls/general.py
@@ -17,90 +17,98 @@ urlpatterns = [
name='crossmark_policy'),
# Editorial and Administrative Workflow
- url(r'^initiate_publication$',
+ url(r'^admin/initiate_publication$',
journals_views.initiate_publication,
name='initiate_publication'),
- url(r'^validate_publication$',
+ url(r'^admin/validate_publication$',
journals_views.validate_publication,
name='validate_publication'),
- url(r'^mark_first_author/(?P<publication_id>[0-9]+)/(?P<author_object_id>[0-9]+)$',
- journals_views.mark_first_author,
- name='mark_first_author'),
- url(r'^add_author/(?P<publication_id>[0-9]+)/(?P<contributor_id>[0-9]+)$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/authors/add/(?P<contributor_id>[0-9]+)$',
journals_views.add_author,
name='add_author'),
- url(r'^add_author/(?P<publication_id>[0-9]+)$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/authors/add$',
journals_views.add_author,
name='add_author'),
- url(r'^manage_metadata/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/authors/mark_first/(?P<author_object_id>[0-9]+)$',
+ journals_views.mark_first_author,
+ name='mark_first_author'),
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/manage_metadata$',
journals_views.manage_metadata,
name='manage_metadata'),
- url(r'^manage_metadata/(?P<issue_doi_label>[a-zA-Z]+.[0-9]+.[0-9]+)$',
+ url(r'^admin/(?P<issue_doi_label>[a-zA-Z]+.[0-9]+.[0-9]+)/manage_metadata$',
journals_views.manage_metadata,
name='manage_metadata'),
- url(r'^manage_metadata/$',
+ url(r'^admin/manage_metadata/$',
journals_views.manage_metadata,
name='manage_metadata'),
- url(r'^create_citation_list_metadata/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/citation_list_metadata$',
journals_views.create_citation_list_metadata,
name='create_citation_list_metadata'),
- url(r'^update_references/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/update_references$',
journals_views.update_references, name='update_references'),
- url(r'^create_funding_info_metadata/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/funders/create_metadata$',
journals_views.create_funding_info_metadata,
name='create_funding_info_metadata'),
- url(r'^add_associated_grant/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
- journals_views.add_associated_grant,
- name='add_associated_grant'),
- url(r'^add_generic_funder/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/funders/add_generic$',
journals_views.add_generic_funder,
name='add_generic_funder'),
- url(r'^create_metadata_xml/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/grants/add$',
+ journals_views.add_associated_grant,
+ name='add_associated_grant'),
+
+ # Metadata handling
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/metadata/crossref/create$',
journals_views.create_metadata_xml,
name='create_metadata_xml'),
- url(r'^metadata_xml_deposit/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/(?P<option>[a-z]+)$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/metadata/crossref/deposit/(?P<option>[a-z]+)$',
journals_views.metadata_xml_deposit,
name='metadata_xml_deposit'),
- url(r'^mark_deposit_success/(?P<deposit_id>[0-9]+)/(?P<success>[0-1])$',
- journals_views.mark_deposit_success,
- name='mark_deposit_success'),
- url(r'^produce_metadata_DOAJ/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/metadata/DOAJ$',
journals_views.produce_metadata_DOAJ,
name='produce_metadata_DOAJ'),
- url(r'^metadata_DOAJ_deposit/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/metadata/DOAJ/deposit$',
journals_views.metadata_DOAJ_deposit,
name='metadata_DOAJ_deposit'),
- url(r'^mark_doaj_deposit_success/(?P<deposit_id>[0-9]+)/(?P<success>[0-1])$',
+ url(r'^admin/metadata/crossref/(?P<deposit_id>[0-9]+)/mark/(?P<success>[0-1])$',
+ journals_views.mark_deposit_success,
+ name='mark_deposit_success'),
+ url(r'^admin/metadata/DOAJ/(?P<deposit_id>[0-9]+)/mark/(?P<success>[0-1])$',
journals_views.mark_doaj_deposit_success,
name='mark_doaj_deposit_success'),
- url(r'^harvest_citedby_list/$',
+ url(r'^admin/metadata/generic/(?P<type_of_object>[a-z]+)/(?P<object_id>[0-9]+)/metadata$',
+ journals_views.generic_metadata_xml_deposit,
+ name='generic_metadata_xml_deposit'),
+ url(r'^admin/metadata/generic/(?P<deposit_id>[0-9]+)/mark/(?P<success>[0-1])$',
+ journals_views.mark_generic_deposit_success,
+ name='mark_generic_deposit_success'),
+ url(r'^admin/generic/(?P<type_of_object>[a-z]+)/(?P<object_id>[0-9]+)/email_made_citable$',
+ journals_views.email_object_made_citable,
+ name='email_object_made_citable'),
+
+ # Citedby
+ url(r'^admin/citedby/$',
journals_views.harvest_citedby_list,
name='harvest_citedby_list'),
- url(r'^harvest_citedby_links/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
+ url(r'^admin/citedby/(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/harvest$',
journals_views.harvest_citedby_links,
name='harvest_citedby_links'),
- url(r'^sign_existing_report/(?P<report_id>[0-9]+)$',
- journals_views.sign_existing_report,
- name='sign_existing_report'),
- url(r'^manage_report_metadata/$',
+
+ # Reports
+ url(r'^reports/$',
journals_views.manage_report_metadata,
name='manage_report_metadata'),
- url(r'^manage_comment_metadata/$',
- journals_views.manage_comment_metadata,
- name='manage_comment_metadata'),
- url(r'^mark_report_doi_needed/(?P<report_id>[0-9]+)/(?P<needed>[0-1])$',
+ url(r'^reports/(?P<report_id>[0-9]+)/sign$',
+ journals_views.sign_existing_report,
+ name='sign_existing_report'),
+ url(r'^reports/(?P<report_id>[0-9]+)/mark_doi_needed/(?P<needed>[0-1])$',
journals_views.mark_report_doi_needed,
name='mark_report_doi_needed'),
- url(r'^mark_comment_doi_needed/(?P<comment_id>[0-9]+)/(?P<needed>[0-1])$',
+
+ # Comments
+ url(r'^comments/$',
+ journals_views.manage_comment_metadata,
+ name='manage_comment_metadata'),
+ url(r'^comments/(?P<comment_id>[0-9]+)/mark_doi_needed/(?P<needed>[0-1])$',
journals_views.mark_comment_doi_needed,
name='mark_comment_doi_needed'),
- url(r'^generic_metadata_xml_deposit/(?P<type_of_object>[a-z]+)/(?P<object_id>[0-9]+)$',
- journals_views.generic_metadata_xml_deposit,
- name='generic_metadata_xml_deposit'),
- url(r'^mark_generic_deposit_success/(?P<deposit_id>[0-9]+)/(?P<success>[0-1])$',
- journals_views.mark_generic_deposit_success,
- name='mark_generic_deposit_success'),
- url(r'^email_object_made_citable/(?P<type_of_object>[a-z]+)/(?P<object_id>[0-9]+)$',
- journals_views.email_object_made_citable,
- name='email_object_made_citable'),
]
diff --git a/journals/utils.py b/journals/utils.py
index da14da589fed0cdb9713666f5c451ad1c6263108..9ae86f9461d9c4784b9f8f2e16e89b524e7212c7 100644
--- a/journals/utils.py
+++ b/journals/utils.py
@@ -37,57 +37,6 @@ class JournalUtils(BaseMailUtil):
reply_to=['admin@scipost.org'])
emailmessage.send(fail_silently=False)
- @classmethod
- def generate_metadata_DOAJ(cls):
- """ Requires loading 'publication' attribute. """
- md = {
- 'bibjson': {
- 'author': [{'name': cls.publication.author_list}],
- 'title': cls.publication.title,
- 'abstract': cls.publication.abstract,
- 'year': cls.publication.publication_date.strftime('%Y'),
- 'month': cls.publication.publication_date.strftime('%m'),
- 'start_page': cls.publication.get_paper_nr(),
- 'identifier': [
- {
- 'type': 'eissn',
- 'id': str(cls.publication.in_issue.in_volume.in_journal.issn)
- },
- {
- 'type': 'doi',
- 'id': cls.publication.doi_string
- }
- ],
- 'link': [
- {
- 'url': cls.request.build_absolute_uri(cls.publication.get_absolute_url()),
- 'type': 'fulltext',
- }
- ],
- 'journal': {
- 'publisher': 'SciPost',
- 'volume': str(cls.publication.in_issue.in_volume.number),
- 'number': str(cls.publication.in_issue.number),
- 'identifier': [{
- 'type': 'eissn',
- 'id': str(cls.publication.in_issue.in_volume.in_journal.issn)
- }],
- 'license': [
- {
- 'url': cls.request.build_absolute_uri(
- cls.publication.in_issue.in_volume.in_journal.get_absolute_url()),
- 'open_access': 'true',
- 'type': cls.publication.get_cc_license_display(),
- 'title': cls.publication.get_cc_license_display(),
- }
- ],
- 'language': ['EN'],
- 'title': cls.publication.in_issue.in_volume.in_journal.get_name_display(),
- }
- }
- }
- return md
-
@classmethod
def email_report_made_citable(cls):
""" Requires loading 'report' attribute. """
diff --git a/journals/views.py b/journals/views.py
index 2456765e8afcf0601a8725e8b6efbec92db10d3d..432e6dc162641a77220292eb28ea14f78ed1d0cd 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -25,7 +25,7 @@ from .models import Journal, Issue, Publication, Deposit, DOAJDeposit,\
GenericDOIDeposit, PublicationAuthorsTable
from .forms import FundingInfoForm, InitiatePublicationForm, ValidatePublicationForm,\
UnregisteredAuthorForm, CreateMetadataXMLForm, CitationListBibitemsForm,\
- ReferenceFormSet
+ ReferenceFormSet, CreateMetadataDOAJForm
from .utils import JournalUtils
from comments.models import Comment
@@ -248,11 +248,6 @@ def validate_publication(request):
# Fill remaining data
submission = publication.accepted_submission
- if publication.first_author_unregistered:
- PublicationAuthorsTable.objects.create(
- order=1,
- publication=publication,
- unregistered_author=publication.first_author_unregistered)
for submission_author in submission.authors.all():
PublicationAuthorsTable.objects.create(
@@ -342,15 +337,6 @@ def mark_first_author(request, publication_id, author_object_id):
publication = get_object_or_404(Publication, id=publication_id)
author_object = get_object_or_404(publication.authors, id=author_object_id)
- # Save explicit relation
- if author_object.is_registered:
- publication.first_author = author_object.contributor
- publication.first_author_unregistered = None
- else:
- publication.first_author = None
- publication.first_author_unregistered = author_object.unregistered_author
- publication.save()
-
# Redo ordering
author_object.order = 1
author_object.save()
@@ -367,14 +353,14 @@ def mark_first_author(request, publication_id, author_object_id):
@permission_required('scipost.can_publish_accepted_submission', return_403=True)
@transaction.atomic
-def add_author(request, publication_id, contributor_id=None, unregistered_author_id=None):
+def add_author(request, doi_label, contributor_id=None, unregistered_author_id=None):
"""
If not all authors are registered Contributors or if they have not
all claimed authorship, this method allows editorial administrators
to associated them to the publication.
This is important for the Crossref metadata, in which all authors must appear.
"""
- publication = get_object_or_404(Publication, id=publication_id)
+ publication = get_object_or_404(Publication, doi_label=doi_label)
if contributor_id:
contributor = get_object_or_404(Contributor, id=contributor_id)
PublicationAuthorsTable.objects.create(contributor=contributor, publication=publication)
@@ -398,7 +384,6 @@ def add_author(request, publication_id, contributor_id=None, unregistered_author
kwargs={'doi_label': publication.doi_label}))
elif form.is_valid():
contributors_found = Contributor.objects.filter(
- # user__first_name__icontains=form.cleaned_data['first_name'],
user__last_name__icontains=form.cleaned_data['last_name'])
context = {
'publication': publication,
@@ -417,18 +402,18 @@ def create_citation_list_metadata(request, doi_label):
in the metadata field in a Publication instance.
"""
publication = get_object_or_404(Publication, doi_label=doi_label)
- if request.method == 'POST':
- bibitems_form = CitationListBibitemsForm(request.POST, request.FILES)
- if bibitems_form.is_valid():
- publication.metadata['citation_list'] = bibitems_form.extract_dois()
- publication.save()
- bibitems_form = CitationListBibitemsForm()
+ bibitems_form = CitationListBibitemsForm(request.POST or None, request.FILES or None)
+ if bibitems_form.is_valid():
+ publication.metadata['citation_list'] = bibitems_form.extract_dois()
+ publication.save()
+ messages.success(request, 'Updated citation list')
+ return redirect(reverse('journals:create_citation_list_metadata',
+ kwargs={'doi_label': publication.doi_label}))
context = {
'publication': publication,
'bibitems_form': bibitems_form,
+ 'citation_list': publication.metadata.get('citation_list', '')
}
- if request.method == 'POST':
- context['citation_list'] = publication.metadata['citation_list']
return render(request, 'journals/create_citation_list_metadata.html', context)
@@ -468,22 +453,22 @@ def create_funding_info_metadata(request, doi_label):
"""
publication = get_object_or_404(Publication, doi_label=doi_label)
- funding_info_form = FundingInfoForm(request.POST or None)
- if funding_info_form.is_valid():
- publication.metadata['funding_statement'] = funding_info_form.cleaned_data[
- 'funding_statement']
- publication.save()
-
- try:
- initial = {'funding_statement': publication.metadata['funding_statement']}
- funding_statement = initial['funding_statement']
- except KeyError:
- initial = {'funding_statement': ''}
- funding_statement = ''
+ funding_statement = publication.metadata.get('funding_statement', '')
+ initial = {
+ 'funding_statement': funding_statement,
+ }
+ form = FundingInfoForm(request.POST or None, instance=publication, initial=initial)
+ if form.is_valid():
+ form.save()
+ messages.success(request, 'Updated funding info')
+ return redirect(reverse('journals:create_funding_info_metadata',
+ kwargs={'doi_label': publication.doi_label}))
- context = {'publication': publication,
- 'funding_info_form': FundingInfoForm(initial=initial),
- 'funding_statement': funding_statement}
+ context = {
+ 'publication': publication,
+ 'funding_info_form': form,
+ 'funding_statement': funding_statement,
+ }
return render(request, 'journals/create_funding_info_metadata.html', context)
@@ -533,13 +518,6 @@ def create_metadata_xml(request, doi_label):
"""
publication = get_object_or_404(Publication, doi_label=doi_label)
- create_metadata_xml_form = CreateMetadataXMLForm(request.POST or None, instance=publication)
- if create_metadata_xml_form.is_valid():
- create_metadata_xml_form.save()
- messages.success(request, 'Metadata XML saved')
- return redirect(reverse('journals:manage_metadata',
- kwargs={'doi_label': doi_label}))
-
# create a doi_batch_id
salt = ""
for i in range(5):
@@ -699,11 +677,20 @@ def create_metadata_xml(request, doi_label):
)
initial['metadata_xml'] += '</body>\n</doi_batch>'
+ create_metadata_xml_form = CreateMetadataXMLForm(request.POST or None,
+ instance=publication,
+ initial=initial)
+ if create_metadata_xml_form.is_valid():
+ create_metadata_xml_form.save()
+ messages.success(request, 'Metadata XML saved')
+ return redirect(reverse('journals:manage_metadata',
+ kwargs={'doi_label': doi_label}))
+
publication.latest_metadata_update = timezone.now()
publication.save()
context = {
'publication': publication,
- 'create_metadata_xml_form': CreateMetadataXMLForm(initial=initial, instance=publication),
+ 'create_metadata_xml_form': create_metadata_xml_form,
}
return render(request, 'journals/create_metadata_xml.html', context)
@@ -719,8 +706,11 @@ def metadata_xml_deposit(request, doi_label, option='test'):
publication = get_object_or_404(Publication, doi_label=doi_label)
if publication.metadata_xml is None:
- errormessage = 'This publication has no metadata. Produce it first before saving it.'
- return render(request, 'scipost/error.html', context={'errormessage': errormessage})
+ messages.warning(
+ request,
+ 'This publication has no metadata. Produce it first before saving it.')
+ return redirect(reverse('journals:create_metadata_xml',
+ kwargs={'doi_label': publication.doi_label}))
timestamp = (publication.metadata_xml.partition(
'<timestamp>'))[2].partition('</timestamp>')[0]
@@ -730,63 +720,71 @@ def metadata_xml_deposit(request, doi_label, option='test'):
+ publication.get_paper_nr() + '/' + publication.doi_label.replace('.', '_')
+ '_Crossref_' + timestamp + '.xml')
+ valid = True
+ response_headers = None
+ response_text = None
if os.path.isfile(path):
- errormessage = 'The metadata file for this metadata timestamp already exists'
- return render(request, 'scipost/error.html', context={'errormessage': errormessage})
-
- if option == 'deposit' and not settings.DEBUG:
- # CAUTION: Real deposit only on production (non-debug-mode)
- url = 'http://doi.crossref.org/servlet/deposit'
+ # Deposit already done before.
+ valid = False
else:
- url = 'http://test.crossref.org/servlet/deposit'
-
- # First perform the actual deposit to Crossref
- params = {
- 'operation': 'doMDUpload',
- 'login_id': settings.CROSSREF_LOGIN_ID,
- 'login_passwd': settings.CROSSREF_LOGIN_PASSWORD,
+ # New deposit, go for it.
+ if option == 'deposit' and not settings.DEBUG:
+ # CAUTION: Real deposit only on production (non-debug-mode)
+ url = 'http://doi.crossref.org/servlet/deposit'
+ else:
+ url = 'http://test.crossref.org/servlet/deposit'
+
+ # First perform the actual deposit to Crossref
+ params = {
+ 'operation': 'doMDUpload',
+ 'login_id': settings.CROSSREF_LOGIN_ID,
+ 'login_passwd': settings.CROSSREF_LOGIN_PASSWORD,
+ }
+ files = {
+ 'fname': ('metadata.xml', publication.metadata_xml.encode('utf-8'), 'multipart/form-data')
}
- files = {
- 'fname': ('metadata.xml', publication.metadata_xml.encode('utf-8'), 'multipart/form-data')
- }
- r = requests.post(url, params=params, files=files)
- response_headers = r.headers
- response_text = r.text
-
- # Then create the associated Deposit object (saving the metadata to a file)
- if option == 'deposit':
- deposit = Deposit(publication=publication, timestamp=timestamp, doi_batch_id=doi_batch_id,
- metadata_xml=publication.metadata_xml, deposition_date=timezone.now())
- deposit.response_text = r.text
-
- # Save the filename with timestamp
- path_with_timestamp = '{issue}/{paper}/{doi}_Crossref_{timestamp}.xml'.format(
- issue=publication.in_issue.path,
- paper=publication.get_paper_nr(),
- doi=publication.doi_label.replace('.', '_'),
- timestamp=timestamp)
- f = open(settings.MEDIA_ROOT + path_with_timestamp, 'w', encoding='utf-8')
- f.write(publication.metadata_xml)
- f.close()
-
- # Copy file
- path_without_timestamp = '{issue}/{paper}/{doi}_Crossref.xml'.format(
- issue=publication.in_issue.path,
- paper=publication.get_paper_nr(),
- doi=publication.doi_label.replace('.', '_'))
- shutil.copyfile(settings.MEDIA_ROOT + path_with_timestamp,
- settings.MEDIA_ROOT + path_without_timestamp)
-
- deposit.metadata_xml_file = path_with_timestamp
- deposit.save()
- publication.latest_crossref_deposit = timezone.now()
- publication.save()
+ r = requests.post(url, params=params, files=files)
+ response_headers = r.headers
+ response_text = r.text
+
+ # Then create the associated Deposit object (saving the metadata to a file)
+ if option == 'deposit':
+ deposit = Deposit(publication=publication,
+ timestamp=timestamp,
+ doi_batch_id=doi_batch_id,
+ metadata_xml=publication.metadata_xml,
+ deposition_date=timezone.now())
+ deposit.response_text = r.text
+
+ # Save the filename with timestamp
+ path_with_timestamp = '{issue}/{paper}/{doi}_Crossref_{timestamp}.xml'.format(
+ issue=publication.in_issue.path,
+ paper=publication.get_paper_nr(),
+ doi=publication.doi_label.replace('.', '_'),
+ timestamp=timestamp)
+ f = open(settings.MEDIA_ROOT + path_with_timestamp, 'w', encoding='utf-8')
+ f.write(publication.metadata_xml)
+ f.close()
+
+ # Copy file
+ path_without_timestamp = '{issue}/{paper}/{doi}_Crossref.xml'.format(
+ issue=publication.in_issue.path,
+ paper=publication.get_paper_nr(),
+ doi=publication.doi_label.replace('.', '_'))
+ shutil.copyfile(settings.MEDIA_ROOT + path_with_timestamp,
+ settings.MEDIA_ROOT + path_without_timestamp)
+
+ deposit.metadata_xml_file = path_with_timestamp
+ deposit.save()
+ publication.latest_crossref_deposit = timezone.now()
+ publication.save()
context = {
'option': option,
'publication': publication,
'response_headers': response_headers,
'response_text': response_text,
+ 'valid': valid,
}
return render(request, 'journals/metadata_xml_deposit.html', context)
@@ -806,12 +804,17 @@ def mark_deposit_success(request, deposit_id, success):
@permission_required('scipost.can_publish_accepted_submission', return_403=True)
def produce_metadata_DOAJ(request, doi_label):
publication = get_object_or_404(Publication, doi_label=doi_label)
- JournalUtils.load({'request': request, 'publication': publication})
- publication.metadata_DOAJ = JournalUtils.generate_metadata_DOAJ()
- publication.save()
- messages.success(request, '<h3>%s</h3>Successfully produced metadata DOAJ.'
- % publication.doi_label)
- return redirect(reverse('journals:manage_metadata'))
+ form = CreateMetadataDOAJForm(request.POST or None, instance=publication, request=request)
+ if form.is_valid():
+ form.save()
+ messages.success(request, '<h3>%s</h3>Successfully produced metadata DOAJ.'
+ % publication.doi_label)
+ return redirect(reverse('journals:manage_metadata'))
+ context = {
+ 'publication': publication,
+ 'form': form
+ }
+ return render(request, 'journals/metadata_doaj_create.html', context)
@permission_required('scipost.can_publish_accepted_submission', return_403=True)
@@ -1245,10 +1248,10 @@ def email_object_made_citable(request, **kwargs):
if type_of_object == 'report':
_object = get_object_or_404(Report, id=object_id)
redirect_to = reverse('journals:manage_report_metadata')
- publication_citation=None
- publication_doi=None
+ publication_citation = None
+ publication_doi = None
try:
- publication=Publication.objects.get(
+ publication = Publication.objects.get(
accepted_submission__arxiv_identifier_wo_vn_nr=_object.submission.arxiv_identifier_wo_vn_nr)
publication_citation = publication.citation()
publication_doi = publication.doi_string
diff --git a/scipost/templates/partials/scipost/personal_page/editorial_actions.html b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
index c614b2e48e939a29a9d7fcfbf319392c95bc6379..b8fc99a5ff64bcbe90296a7f436111cbd2c5e4cb 100644
--- a/scipost/templates/partials/scipost/personal_page/editorial_actions.html
+++ b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
@@ -157,7 +157,7 @@
<li class="list-group-item">
<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 %}
+ {% 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.arxiv_identifier_w_vn_nr %}">Editorial Page</a>.</p>
</div>
</li>
diff --git a/scipost/templates/partials/scipost/personal_page/submissions.html b/scipost/templates/partials/scipost/personal_page/submissions.html
index 2af5125f616fa08dae91440a3704a180b2b6e801..9dc38d1e5e07e686bdacece95ab11ed8e5699d7b 100644
--- a/scipost/templates/partials/scipost/personal_page/submissions.html
+++ b/scipost/templates/partials/scipost/personal_page/submissions.html
@@ -25,7 +25,7 @@
<li class="list-group-item">
<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 %}
+ {% include 'partials/submissions/submission_status.html' with submission=sub %}
{% if request.user.contributor == sub.submitted_by %}
<p class="card-text mt-1">
diff --git a/scipost/templates/scipost/Fellow_activity_overview.html b/scipost/templates/scipost/Fellow_activity_overview.html
index dcfe8de994c2eb99145f8c0818d843ee436aa427..1d6c2fdf01cc2900cdf5543e367c079bd6c862c8 100644
--- a/scipost/templates/scipost/Fellow_activity_overview.html
+++ b/scipost/templates/scipost/Fellow_activity_overview.html
@@ -61,7 +61,7 @@
<li class="list-group-item">
<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 %}
+ {% include 'partials/submissions/submission_status.html' with submission=assignment.submission %}
</div>
</li>
{% empty %}
@@ -80,7 +80,7 @@
<li class="list-group-item">
<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 %}
+ {% include 'partials/submissions/submission_status.html' with submission=assignment.submission %}
</div>
</li>
{% empty %}
diff --git a/stats/templates/stats/statistics.html b/stats/templates/stats/statistics.html
index a1c1f99c63a69aacbd0440b38cbea13ec971fbc2..62cb8ec026a384fbb9e3d3cb5cd643a222105d3e 100644
--- a/stats/templates/stats/statistics.html
+++ b/stats/templates/stats/statistics.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_pool_base.html' %}
+{% extends 'submissions/pool/base.html' %}
{% block pagetitle %}: statistics for submisisons{% endblock pagetitle %}
diff --git a/submissions/templates/submissions/_arxiv_queryresult.html b/submissions/templates/partials/submissions/arxiv_queryresult.html
similarity index 100%
rename from submissions/templates/submissions/_arxiv_queryresult.html
rename to submissions/templates/partials/submissions/arxiv_queryresult.html
diff --git a/submissions/templates/submissions/_assignment_info.html b/submissions/templates/partials/submissions/pool/assignment_info.html
similarity index 100%
rename from submissions/templates/submissions/_assignment_info.html
rename to submissions/templates/partials/submissions/pool/assignment_info.html
diff --git a/submissions/templates/submissions/_editorial_communication_content.html b/submissions/templates/partials/submissions/pool/editorial_communication_content.html
similarity index 100%
rename from submissions/templates/submissions/_editorial_communication_content.html
rename to submissions/templates/partials/submissions/pool/editorial_communication_content.html
diff --git a/submissions/templates/submissions/_submission_refereeing_invitations.html b/submissions/templates/partials/submissions/pool/referee_invitations.html
similarity index 100%
rename from submissions/templates/submissions/_submission_refereeing_invitations.html
rename to submissions/templates/partials/submissions/pool/referee_invitations.html
diff --git a/submissions/templates/submissions/_submission_refereeing_status.html b/submissions/templates/partials/submissions/pool/referee_invitations_status.html
similarity index 100%
rename from submissions/templates/submissions/_submission_refereeing_status.html
rename to submissions/templates/partials/submissions/pool/referee_invitations_status.html
diff --git a/submissions/templates/submissions/_required_actions_block.html b/submissions/templates/partials/submissions/pool/required_actions_block.html
similarity index 100%
rename from submissions/templates/submissions/_required_actions_block.html
rename to submissions/templates/partials/submissions/pool/required_actions_block.html
diff --git a/submissions/templates/partials/submissions/pool/submission_assignment_request.html b/submissions/templates/partials/submissions/pool/submission_assignment_request.html
index 4a96fa72d300958b7de5768b244a8ccd0ba72349..c45ae8abcf11bcdf3adc81eb94cabe79aacc6321 100644
--- a/submissions/templates/partials/submissions/pool/submission_assignment_request.html
+++ b/submissions/templates/partials/submissions/pool/submission_assignment_request.html
@@ -1,7 +1,7 @@
{% load bootstrap %}
-{% include 'submissions/_submission_summary.html' with submission=assignment.submission %}
+{% include 'partials/submissions/submission_summary.html' with submission=assignment.submission show_abstract=1 %}
<h2 class="highlight">Accept or Decline this Assignment</h2>
<h3 class="mb-2">By accepting, you will be required to start a refereeing round on the next screen.</h3>
diff --git a/submissions/templates/submissions/_form_submission_cycle_choice.html b/submissions/templates/partials/submissions/pool/submission_cycle_choice_form.html
similarity index 100%
rename from submissions/templates/submissions/_form_submission_cycle_choice.html
rename to submissions/templates/partials/submissions/pool/submission_cycle_choice_form.html
diff --git a/submissions/templates/partials/submissions/pool/submission_details.html b/submissions/templates/partials/submissions/pool/submission_details.html
index 766d9c28591f67b1a6b8aa8b0a9e760197b49da2..d8b17662f5918fb642d1aa70ac453b794fcfd5ad 100644
--- a/submissions/templates/partials/submissions/pool/submission_details.html
+++ b/submissions/templates/partials/submissions/pool/submission_details.html
@@ -26,7 +26,7 @@
<div>
<h3>Remarks on this submission:</h3>
{% if remark_form %}
- {% include 'submissions/_remark_add_form.html' with submission=submission form=remark_form auto_show=1 %}
+ {% include 'partials/submissions/remark_form.html' with submission=submission form=remark_form auto_show=1 %}
{% endif %}
<p class="mb-1">Current remarks:</p>
<ul>
@@ -39,7 +39,7 @@
{% if is_editor_in_charge or is_editorial_admin or submission|is_voting_fellow:request.user %}
<br>
- {% include 'submissions/_required_actions_block.html' with submission=submission %}
+ {% include 'partials/submissions/pool/required_actions_block.html' with submission=submission %}
<h4>
<a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial Page</a>
</h4>
@@ -56,7 +56,7 @@
<li>EIC Assignment requests:</li>
<ul class="pl-3">
{% for assignment in submission.editorial_assignments.all %}
- {% include 'submissions/_assignment_info.html' with assignment=assignment %}
+ {% include 'partials/submissions/pool/assignment_info.html' with assignment=assignment %}
{% empty %}
<li>No assignment requests have been sent</li>
{% endfor %}
@@ -101,7 +101,7 @@
<h3>Events</h3>
<div id="eventslist">
- {% include 'submissions/submission_event_list.html' with events=submission.events.for_eic %}
+ {% include 'partials/submissions/submission_events.html' with events=submission.events.for_eic %}
</div>
{% endif %}
</div>
diff --git a/submissions/templates/submissions/_recommendation_author_content.html b/submissions/templates/partials/submissions/recommendation_author_content.html
similarity index 100%
rename from submissions/templates/submissions/_recommendation_author_content.html
rename to submissions/templates/partials/submissions/recommendation_author_content.html
diff --git a/submissions/templates/submissions/_recommendation_fellow_content.html b/submissions/templates/partials/submissions/recommendation_fellow_content.html
similarity index 88%
rename from submissions/templates/submissions/_recommendation_fellow_content.html
rename to submissions/templates/partials/submissions/recommendation_fellow_content.html
index e2e3926a7571e729e8b1f8683e479bd170862049..996767c3adf52f649d24f4b15f4fdfca6192e16e 100644
--- a/submissions/templates/submissions/_recommendation_fellow_content.html
+++ b/submissions/templates/partials/submissions/recommendation_fellow_content.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_recommendation_author_content.html' %}
+{% extends 'partials/submissions/recommendation_author_content.html' %}
{% block recommendation_header %}
<h3 class="card-title text-muted mb-3">By {{recommendation.submission.editor_in_charge.get_title_display}} {{recommendation.submission.editor_in_charge.user.first_name}} {{recommendation.submission.editor_in_charge.user.last_name}}, formulated on {{recommendation.date_submitted}}</h3>
diff --git a/submissions/templates/submissions/_refereeing_pack_tex_template.html b/submissions/templates/partials/submissions/refereeing_pack_tex_template.html
similarity index 100%
rename from submissions/templates/submissions/_refereeing_pack_tex_template.html
rename to submissions/templates/partials/submissions/refereeing_pack_tex_template.html
diff --git a/submissions/templates/submissions/_remark_add_form.html b/submissions/templates/partials/submissions/remark_form.html
similarity index 100%
rename from submissions/templates/submissions/_remark_add_form.html
rename to submissions/templates/partials/submissions/remark_form.html
diff --git a/submissions/templates/submissions/_single_report_content.html b/submissions/templates/partials/submissions/report_content.html
similarity index 92%
rename from submissions/templates/submissions/_single_report_content.html
rename to submissions/templates/partials/submissions/report_content.html
index b9f945df58a9ddf98e1963cdfa8aaa9f4f1fd10c..a93c921270cdc2ca611d13804c7985cd26094d1c 100644
--- a/submissions/templates/submissions/_single_report_content.html
+++ b/submissions/templates/partials/submissions/report_content.html
@@ -34,4 +34,4 @@
</div>
{% endif %}
-{% include 'submissions/_single_report_ratings.html' with report=report %}
+{% include 'partials/submissions/report_ratings.html' with report=report %}
diff --git a/submissions/templates/submissions/_single_public_report.html b/submissions/templates/partials/submissions/report_public.html
similarity index 87%
rename from submissions/templates/submissions/_single_public_report.html
rename to submissions/templates/partials/submissions/report_public.html
index c39fcdc22220cb2a003b96a637c94a49f6f19fca..68e18f4cff19509ebbe58837df602f486d60bfcf 100644
--- a/submissions/templates/submissions/_single_public_report.html
+++ b/submissions/templates/partials/submissions/report_public.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_single_public_report_without_comments.html' %}
+{% extends 'partials/submissions/report_public_without_comments.html' %}
{% block single_report_footer %}
{% if user.is_authenticated and perms.scipost.can_submit_comments %}
diff --git a/submissions/templates/submissions/_single_public_report_without_comments.html b/submissions/templates/partials/submissions/report_public_without_comments.html
similarity index 97%
rename from submissions/templates/submissions/_single_public_report_without_comments.html
rename to submissions/templates/partials/submissions/report_public_without_comments.html
index af833812c9e19c8bba2d595264b754c305a2b92e..9555c67c431dcabe7495f5bb1b48ef030249c6c8 100644
--- a/submissions/templates/submissions/_single_public_report_without_comments.html
+++ b/submissions/templates/partials/submissions/report_public_without_comments.html
@@ -47,7 +47,7 @@
</div>
</div>
- {% include 'submissions/_single_report_content.html' with report=report %}
+ {% include 'partials/submissions/report_content.html' with report=report %}
<div class="row">
<div class="col-12">
@@ -93,7 +93,7 @@
{% endif %}
</div>
- {% include 'submissions/_single_report_content.html' with report=report %}
+ {% include 'partials/submissions/report_content.html' with report=report %}
{% endif %}
{% block single_report_footer %}{% endblock %}
diff --git a/submissions/templates/submissions/_single_report_ratings.html b/submissions/templates/partials/submissions/report_ratings.html
similarity index 100%
rename from submissions/templates/submissions/_single_report_ratings.html
rename to submissions/templates/partials/submissions/report_ratings.html
diff --git a/submissions/templates/submissions/_single_report_card_summary.html b/submissions/templates/partials/submissions/report_summary.html
similarity index 100%
rename from submissions/templates/submissions/_single_report_card_summary.html
rename to submissions/templates/partials/submissions/report_summary.html
diff --git a/submissions/templates/submissions/_report_tex_template.html b/submissions/templates/partials/submissions/report_tex_template.html
similarity index 100%
rename from submissions/templates/submissions/_report_tex_template.html
rename to submissions/templates/partials/submissions/report_tex_template.html
diff --git a/submissions/templates/submissions/submission_event_list.html b/submissions/templates/partials/submissions/submission_events.html
similarity index 100%
rename from submissions/templates/submissions/submission_event_list.html
rename to submissions/templates/partials/submissions/submission_events.html
diff --git a/submissions/templates/submissions/submission_event_list_general.html b/submissions/templates/partials/submissions/submission_events_explicit.html
similarity index 100%
rename from submissions/templates/submissions/submission_event_list_general.html
rename to submissions/templates/partials/submissions/submission_events_explicit.html
diff --git a/submissions/templates/submissions/_submission_status_block.html b/submissions/templates/partials/submissions/submission_status.html
similarity index 100%
rename from submissions/templates/submissions/_submission_status_block.html
rename to submissions/templates/partials/submissions/submission_status.html
diff --git a/submissions/templates/submissions/_submission_summary_short.html b/submissions/templates/partials/submissions/submission_summary.html
similarity index 80%
rename from submissions/templates/submissions/_submission_summary_short.html
rename to submissions/templates/partials/submissions/submission_summary.html
index ff72a5fc218c790d1c9300e8def634a897876246..427d36973ac5380c969af0418e26df2e96a7283c 100644
--- a/submissions/templates/submissions/_submission_summary_short.html
+++ b/submissions/templates/partials/submissions/submission_summary.html
@@ -54,4 +54,12 @@
</tr>
</table>
-{% block submission_summary_footer %}{% endblock %}
+{% if show_abstract %}
+ {% if submission.pdf_refereeing_pack %}
+ <p class="mt-3">
+ <a href="{% url 'submissions:refereeing_package_pdf' submission.arxiv_identifier_w_vn_nr %}" target="_blank" class="btn btn-outline-primary">Download Refereeing Package</a>
+ </p>
+ {% endif %}
+ <h3 class="mt-3">Abstract</h3>
+ <p>{{submission.abstract}}</p>
+{% endif %}
diff --git a/submissions/templates/partials/submissions/submission_version.html b/submissions/templates/partials/submissions/submission_version.html
new file mode 100644
index 0000000000000000000000000000000000000000..a06f0aac66da95cea0278d8e4a1500a10d43b032
--- /dev/null
+++ b/submissions/templates/partials/submissions/submission_version.html
@@ -0,0 +1,10 @@
+<div class="py-1">
+ <a href="{{submission.get_absolute_url}}" class="pubtitleli">version {{submission.arxiv_vn_nr}}</a>
+ <span class="version-suffix">
+ {% if submission.is_current %}
+ (current version)
+ {% else %}
+ (deprecated version {{submission.arxiv_vn_nr}})
+ {% endif %}
+ </span>
+</div>
diff --git a/submissions/templates/submissions/_pool_base.html b/submissions/templates/submissions/_pool_base.html
deleted file mode 100644
index f2c5074cef8ced37641ffbf53c052ccf2cf9329f..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_pool_base.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block breadcrumb %}
- <div class="container-outside header">
- <div class="container">
- <nav class="breadcrumb hidden-sm-down">
- {% block breadcrumb_items %}
- <a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
- {% endblock %}
- </nav>
- </div>
- </div>
-{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_base.html b/submissions/templates/submissions/_submission_card_base.html
deleted file mode 100644
index 1d3be2c52c30e32892f05b473ad70a2ce46991b3..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_card_base.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="submission_title">
- <h5 class="pb-0">{{submission.get_subject_area_display}}</h5>
- <h3 class="card-title {% block title_class_block %}{% endblock %}">
- <a href="{{submission.get_absolute_url}}">{{submission.title}}</a>
- </h3>
-</div>
-
-{% block card_block_footer %}{% endblock %}
diff --git a/submissions/templates/submissions/_submission_card_in_pool.html b/submissions/templates/submissions/_submission_card_in_pool.html
deleted file mode 100644
index cd69c1f89a6cc73f5e9862b197b9ccf7c96ef382..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_card_in_pool.html
+++ /dev/null
@@ -1,63 +0,0 @@
-{% load guardian_tags %}
-{% load scipost_extras %}
-{% load submissions_extras %}
-{% load user_groups %}
-
-{% is_editor_in_charge request.user submission as is_editor_in_charge %}
-{% is_edcol_admin request.user as is_editorial_admin %}
-
-{# !! 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 %}
- <h4>Remarks on this submission:</h4>
- <ul>
- {% for rem in submission.remarks.all %}
- {% include 'scipost/_remark_li.html' with remark=rem %}
- {% endfor %}
- </ul>
- {% endif %}
-
- {% if remark_form %}
- {% include 'submissions/_remark_add_form.html' with submission=submission form=remark_form %}
- {% endif %}
-
- {% if is_editor_in_charge or is_editorial_admin %}
- {% include 'submissions/_required_actions_block.html' with submission=submission %}
- <h4>
- <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial Page</a>
- </h4>
- {% endif %}
-
- {% if perms.scipost.can_assign_submissions %}
- {% if submission.editorial_assignments.exists %}
- <h4>EIC Assignment requests:</h4>
- <ul>
- {% for assignment in submission.editorial_assignments.all %}
- {% include 'submissions/_assignment_info.html' with assignment=assignment %}
- {% endfor %}
- </ul>
- {% endif %}
- {% if submission.editor_in_charge == None %}
- <h4>Actions:</h4>
- <ul>
- <li><a href="{% url 'submissions:assign_submission' submission.arxiv_identifier_w_vn_nr %}">Send a new assignment request</a></li>
- <li><a href="{% url 'submissions:assignment_failed' submission.arxiv_identifier_w_vn_nr %}">Close pre-screening: failure to find EIC</a></li>
- </ul>
- {% endif %}
- {% endif %}
-
- {% if is_editorial_admin %}
- <h4>
- <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='StoE' %}">Send a communication to the Editor-in-charge</a>
- </h4>
- {% if submission.status == 'accepted' %}
- <h4>After proofs have been accepted, you can <a href="{% url 'journals:initiate_publication' %}">initiate the publication process</a> (leads to the validation page)</h4>
- {% endif %}
- {% endif %}
-</div>
diff --git a/submissions/templates/submissions/_submission_summary.html b/submissions/templates/submissions/_submission_summary.html
deleted file mode 100644
index 613cc023ff67d310dc160c307b72ce562be694b6..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_summary.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'submissions/_submission_summary_short.html' %}
-
-{% block submission_summary_footer %}
- {% if submission.pdf_refereeing_pack %}
- <p class="mt-3">
- <a href="{% url 'submissions:refereeing_package_pdf' submission.arxiv_identifier_w_vn_nr %}" target="_blank" class="btn btn-outline-primary">Download Refereeing Package</a>
- </p>
- {% endif %}
- <h3 class="mt-3">Abstract</h3>
- <p>{{submission.abstract}}</p>
-{% endblock %}
diff --git a/submissions/templates/submissions/_submission_version.html b/submissions/templates/submissions/_submission_version.html
deleted file mode 100644
index f32d7c5f22928d60fcdd2a22371be9f32671b782..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_submission_version.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="py-1">
- {% if editorial_page %}
- <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}" class="pubtitleli">version {{submission.arxiv_vn_nr}}</a>
- {% else %}
- <a href="{{submission.get_absolute_url}}" class="pubtitleli">version {{submission.arxiv_vn_nr}}</a>
- {% endif %}
- <span class="version-suffix">
- {% if submission.is_current %}
- (current version)
- {% else %}
- (deprecated version {{submission.arxiv_vn_nr}})
- {% endif %}
- </span>
-</div>
diff --git a/submissions/templates/submissions/assignment_failed.html b/submissions/templates/submissions/admin/editorial_assignment_failed.html
similarity index 100%
rename from submissions/templates/submissions/assignment_failed.html
rename to submissions/templates/submissions/admin/editorial_assignment_failed.html
diff --git a/submissions/templates/submissions/assign_submission.html b/submissions/templates/submissions/admin/editorial_assignment_form.html
similarity index 84%
rename from submissions/templates/submissions/assign_submission.html
rename to submissions/templates/submissions/admin/editorial_assignment_form.html
index 54574a668dbc3eee84644aaf5253beea98d93e53..17e933e6bd6a2d1b425ad0d695b0c0baa03e629e 100644
--- a/submissions/templates/submissions/assign_submission.html
+++ b/submissions/templates/submissions/admin/editorial_assignment_form.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_pool_base.html' %}
+{% extends 'submissions/pool/base.html' %}
{% load bootstrap %}
@@ -19,7 +19,7 @@
</div>
</div>
-{% include 'submissions/_submission_summary.html' with submission=submission_to_assign %}
+{% include 'partials/submissions/submission_summary.html' with submission=submission_to_assign show_abstract=1 %}
<div class="row">
<div class="col-12">
@@ -33,7 +33,7 @@
<p>{{ submission_to_assign.referees_flagged }}</p>
{% endif %}
- {% include 'submissions/_submission_status_block.html' with submission=submission_to_assign %}
+ {% include 'partials/submissions/submission_status.html' with submission=submission_to_assign %}
</div>
</div>
@@ -44,7 +44,7 @@
<h3>If more than 5 Fellows have declined an assignment for a red-marked reason, the Submission should be rejected.</h3>
<ul>
{% for assignment in sub.editorial_assignments.all %}
- {% include 'submissions/_assignment_info.html' with assignment=assignment %}
+ {% include 'partials/submissions/pool/assignment_info.html' with assignment=assignment %}
{% endfor %}
</ul>
{% endif %}
diff --git a/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html b/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
index 86e795e657b8447e3b5aec0b851337701c105d4d..48c6e011de6e85b3e053426b71dc861f6dfa49cd 100644
--- a/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
+++ b/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
@@ -18,7 +18,7 @@
{% include 'partials/submissions/pool/submission_info_table.html' with submission=recommendation.submission %}
<br>
-{% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
+{% include 'partials/submissions/recommendation_fellow_content.html' with recommendation=recommendation %}
{% if recommendation.submission.referees_flagged %}
<br>
@@ -64,7 +64,7 @@
</li>
{% for entry in value.entries %}
<li class="list-group-item">
- {% include 'submissions/_arxiv_queryresult.html' with item=entry %}
+ {% include 'partials/submissions/arxiv_queryresult.html' with item=entry %}
</li>
{% endfor %}
{% endfor %}
diff --git a/submissions/templates/submissions/admin/refereeing_overview.html b/submissions/templates/submissions/admin/refereeing_overview.html
index 398e14c535879434ed3fae731fc7bc8ba1e88f87..2c71d7884dd078f6fd4c342208b92995ba83646e 100644
--- a/submissions/templates/submissions/admin/refereeing_overview.html
+++ b/submissions/templates/submissions/admin/refereeing_overview.html
@@ -27,11 +27,11 @@
Refereeing deadline: {{ submission.reporting_deadline }}<br>
<br>
Refereeing status summary:<br>
- {% include 'submissions/_submission_refereeing_status.html' with submission=submission %}
+ {% include 'partials/submissions/pool/referee_invitations_status.html' with submission=submission %}
</div>
<p class="mb-2">Detail of refereeing invitations:</p>
- {% include 'submissions/_submission_refereeing_invitations.html' with submission=submission invitations=submission.referee_invitations.all %}
+ {% include 'partials/submissions/pool/referee_invitations.html' with submission=submission invitations=submission.referee_invitations.all %}
<a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='StoE' %}" target="_blank">Send a communication to the Editor-in-charge</a>
</div>
</div>
diff --git a/submissions/templates/submissions/reports_pdf_compile.html b/submissions/templates/submissions/admin/report_compile_form.html
similarity index 92%
rename from submissions/templates/submissions/reports_pdf_compile.html
rename to submissions/templates/submissions/admin/report_compile_form.html
index bf46e0b6860c836b3d5a3c7d843508ea94253412..5be44d16ee6fec7ee94639e9e26941d100861f61 100644
--- a/submissions/templates/submissions/reports_pdf_compile.html
+++ b/submissions/templates/submissions/admin/report_compile_form.html
@@ -16,7 +16,7 @@
<div class="col-12">
<h1 class="highlight">Upload Report PDF</h1>
<div class="card">
- {% include 'submissions/_single_report_card_summary.html' with submission=report %}
+ {% include 'partials/submissions/report_summary.html' with submission=report %}
</div>
</div>
</div>
@@ -25,7 +25,7 @@
<div class="col-12">
<h3>Please process this code in your Tex Compiler:</h3>
<p>To compile, one needs the SciPost Latex Package. Please <a href="mailto: info@scipost.org">contact SciPost</a> if you did not receive it.</p>
- <pre class="clickfocus" style="max-height: 200px;"><code>{% include 'submissions/_report_tex_template.html' with report=report %}</code></pre>
+ <pre class="clickfocus" style="max-height: 200px;"><code>{% include 'partials/submissions/report_tex_template.html' with report=report %}</code></pre>
</div>
</div>
diff --git a/submissions/templates/submissions/reports_accepted_list.html b/submissions/templates/submissions/admin/report_list.html
similarity index 100%
rename from submissions/templates/submissions/reports_accepted_list.html
rename to submissions/templates/submissions/admin/report_list.html
diff --git a/submissions/templates/submissions/pool/assignments.html b/submissions/templates/submissions/pool/assignments.html
index 73dfcb932ee00dbb41e9e8da8c19e13a37ee2f5f..6b03faec25814696b8779db89d2d61e2b623293e 100644
--- a/submissions/templates/submissions/pool/assignments.html
+++ b/submissions/templates/submissions/pool/assignments.html
@@ -29,7 +29,7 @@
{% 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 %}
+ {% include 'partials/submissions/pool/required_actions_block.html' with submission=submission %}
<h4 class="d-block mt-2">
<a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial Page</a>
</h4>
diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/pool/editorial_page.html
similarity index 91%
rename from submissions/templates/submissions/editorial_page.html
rename to submissions/templates/submissions/pool/editorial_page.html
index 2711220d5e2bcb6800d0401fb1d3b272e5a152bd..3f0bb62ec032cdfe8a90c89a93bef812d87411b4 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/pool/editorial_page.html
@@ -26,7 +26,7 @@
</div>
<h3 class="mt-4">Submission summary</h3>
- {% include 'submissions/_submission_summary_short.html' with submission=submission hide_title=1 %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission hide_title=1 %}
<br>
{% if submission.author_comments %}
@@ -56,7 +56,7 @@
{% for recommendation in submission.eicrecommendations.all %}
- {% include 'submissions/_recommendation_author_content.html' with recommendation=recommendation %}
+ {% include 'partials/submissions/recommendation_author_content.html' with recommendation=recommendation %}
{% if recommendation.may_be_reformulated %}
<a href="{% url 'submissions:reformulate_eic_recommendation' submission.arxiv_identifier_w_vn_nr %}">Reformulate this Editorial Recommendation</a>
{% endif %}
@@ -77,7 +77,7 @@
<div class="row"><!-- Status -->
<div class="col-md-12">
- {% include 'submissions/_submission_status_block.html' with submission=submission %}
+ {% include 'partials/submissions/submission_status.html' with submission=submission %}
{% if submission.plagiarism_report %}
<h4>Plagiarism report status: {% if submission.plagiarism_report.percent_match %}<b>{{submission.plagiarism_report.percent_match}}%</b>{% else %}<em>Scan in progress</em>{% endif %}</h4>
{% endif %}
@@ -87,7 +87,7 @@
{% if full_access %}
<div class="row">
<div class="col-md-10 col-lg-8">
- {% include 'submissions/_required_actions_block.html' with submission=submission %}
+ {% include 'partials/submissions/pool/required_actions_block.html' with submission=submission %}
</div>
</div>
{% endif %}
@@ -96,7 +96,7 @@
{% if full_access %}
<div class="row">
<div class="col-12">
- {% include 'submissions/_form_submission_cycle_choice.html' with form=cycle_choice_form submission=submission %}
+ {% include 'partials/submissions/pool/submission_cycle_choice_form.html' with form=cycle_choice_form submission=submission %}
</div>
</div>
{% else %}
@@ -111,7 +111,7 @@
<div class="row">
<div class="col-12">
<h3>Refereeing status summary:</h3>
- {% include 'submissions/_submission_refereeing_status.html' with submission=submission %}
+ {% include 'partials/submissions/pool/referee_invitations_status.html' with submission=submission %}
</div>
</div>
@@ -119,7 +119,7 @@
<div class="row">
<div class="col-12">
<h3 class="mb-2">Detail of refereeing invitations:</h3>
- {% include 'submissions/_submission_refereeing_invitations.html' with submission=submission invitations=submission.referee_invitations.all %}
+ {% include 'partials/submissions/pool/referee_invitations.html' with submission=submission invitations=submission.referee_invitations.all %}
</div>
</div>
{% endif %}
@@ -245,7 +245,7 @@
<ul class="list-group list-group-flush">
{% for comm in submission.editorial_communications.all %}
<li class="list-group-item">
- {% include 'submissions/_editorial_communication_content.html' with communication=comm %}
+ {% include 'partials/submissions/pool/editorial_communication_content.html' with communication=comm %}
</li>
{% empty %}
<li class="list-group-item">There have been no communications for this Submission.</li>
@@ -255,8 +255,7 @@
</div>
<h2 class="mt-3">Events</h2>
- {% include 'submissions/submission_event_list.html' with events=submission.events.for_eic %}
-
+ {% include 'partials/submissions/submission_events.html' with events=submission.events.for_eic %}
{% endif %}
<div class="mb-5"></div>
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index e64124a83bdf0397e76a22156c6a89bced31181f..92ae237be3333eb98e753ecaac6f0c2d873c06d5 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -55,7 +55,7 @@
{% if latest_submission_events %}
<a href="javascript:void(0)" class="btn" data-toggle="toggle" data-target="#lastest_events_list"><i class="fa fa-comments-o"></i> View/hide latest events ({{ latest_submission_events|length }}) in the last 24 hours</a>
<div id="lastest_events_list" style="display: none;">
- {% include 'submissions/submission_event_list_general.html' with events=latest_submission_events %}
+ {% include 'partials/submissions/submission_events_explicit.html' with events=latest_submission_events %}
</div>
{% endif %}
</div>
diff --git a/submissions/templates/submissions/pool/recommendation.html b/submissions/templates/submissions/pool/recommendation.html
index e4022613693d85d850eb27fe1f8d338c8bf6aad6..15af3dc47af8d3aa0995d5580ca5385c2679b688 100644
--- a/submissions/templates/submissions/pool/recommendation.html
+++ b/submissions/templates/submissions/pool/recommendation.html
@@ -21,7 +21,7 @@
{% include 'partials/submissions/pool/submission_info_table.html' with submission=recommendation.submission %}
<br>
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
+ {% include 'partials/submissions/recommendation_fellow_content.html' with recommendation=recommendation %}
<div class="card">
<div class="card-body">
diff --git a/submissions/templates/submissions/pool/recommendation_formulate.html b/submissions/templates/submissions/pool/recommendation_formulate.html
index 2ae4a3ce76cf271233f8012359db8eb607af13c7..7ff9df4c9f07415c6c1a208911143508ee34ccc5 100644
--- a/submissions/templates/submissions/pool/recommendation_formulate.html
+++ b/submissions/templates/submissions/pool/recommendation_formulate.html
@@ -16,7 +16,7 @@
<h1 class="highlight">Formulate Editorial Recommendation for Submission</h1>
<br>
-{% include 'submissions/_submission_summary.html' with submission=submission %}
+{% include 'partials/submissions/submission_summary.html' with submission=submission show_abstract=1 %}
<br>
<div class="card card-grey">
diff --git a/submissions/templates/submissions/pool/recommendation_formulate_rewrite.html b/submissions/templates/submissions/pool/recommendation_formulate_rewrite.html
index 58b73d22d4a46f9f5313b830eb8743ed00495376..17dcf9a8b4d07500609657b9ce741e021d1e3708 100644
--- a/submissions/templates/submissions/pool/recommendation_formulate_rewrite.html
+++ b/submissions/templates/submissions/pool/recommendation_formulate_rewrite.html
@@ -16,7 +16,7 @@
<h1 class="highlight">Reformulate Editorial Recommendation for Submission</h1>
<br>
-{% include 'submissions/_submission_summary.html' with submission=submission %}
+{% include 'partials/submissions/submission_summary.html' with submission=submission show_abstract=1 %}
<br>
<div class="card card-grey">
diff --git a/submissions/templates/submissions/select_referee.html b/submissions/templates/submissions/referee_form.html
similarity index 95%
rename from submissions/templates/submissions/select_referee.html
rename to submissions/templates/submissions/referee_form.html
index ecaa27de42430dcc9483b18e0c3b2272a5597677..8fae92385d4bde0416a0f6bffbb356bec371811f 100644
--- a/submissions/templates/submissions/select_referee.html
+++ b/submissions/templates/submissions/referee_form.html
@@ -28,7 +28,7 @@
<div class="row">
<div class="col-12">
<h2>Submission:</h2>
- {% include 'submissions/_submission_summary.html' with submission=submission %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission show_abstract=1 %}
{% if submission.referees_flagged %}
<h3>Referees flagged upon submission (treat reports with caution):</h3>
@@ -61,7 +61,7 @@
<ul class="list-group list-group-flush">
{% for entry in queryresults.entries %}
<li class="list-group-item">
- {% include 'submissions/_arxiv_queryresult.html' with item=entry %}
+ {% include 'partials/submissions/arxiv_queryresult.html' with item=entry %}
</li>
{% endfor %}
</ul>
diff --git a/submissions/templates/submissions/decline_ref_invitation.html b/submissions/templates/submissions/referee_invitations_decline.html
similarity index 100%
rename from submissions/templates/submissions/decline_ref_invitation.html
rename to submissions/templates/submissions/referee_invitations_decline.html
diff --git a/submissions/templates/submissions/accept_or_decline_ref_invitations.html b/submissions/templates/submissions/referee_invitations_form.html
similarity index 93%
rename from submissions/templates/submissions/accept_or_decline_ref_invitations.html
rename to submissions/templates/submissions/referee_invitations_form.html
index b20a59fba2ad3223205d1952dff2fc7a0e94df35..7d23dc5c50f54fa41dba998b216420617cbd2054 100644
--- a/submissions/templates/submissions/accept_or_decline_ref_invitations.html
+++ b/submissions/templates/submissions/referee_invitations_form.html
@@ -36,7 +36,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-12">
<h1 class="highlight">SciPost Submission which you are asked to Referee (see below to accept/decline):</h1>
- {% include 'submissions/_submission_summary.html' with submission=invitation.submission %}
+ {% include 'partials/submissions/submission_summary.html' with submission=invitation.submission show_abstract=1 %}
</div>
</div>
<div class="row">
diff --git a/submissions/templates/submissions/submit_report.html b/submissions/templates/submissions/report_form.html
similarity index 97%
rename from submissions/templates/submissions/submit_report.html
rename to submissions/templates/submissions/report_form.html
index 274ff302e0da162931869bd42e77e541529736f6..5c6c813aefffc2db5a0df7c883b9dfd8b90beb7b 100644
--- a/submissions/templates/submissions/submit_report.html
+++ b/submissions/templates/submissions/report_form.html
@@ -72,7 +72,7 @@
<div class="row">
<div class="col-12">
<h2>Submission</h2>
- {% include 'submissions/_submission_summary.html' with submission=submission %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission show_abstract=1 %}
</div>
</div>
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 3642ad9bda4636c439c99105244da83e4edd0e7c..0d6dd800738d0cec86087a939f8efd0969f93639 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -54,7 +54,7 @@
<li>Other versions of this Submission (with Reports) exist:</li>
<ul class="list-unstyled">
{% for vn in submission.other_versions %}
- <li>{% include 'submissions/_submission_version.html' with submission=vn %}</li>
+ <li>{% include 'partials/submissions/submission_version.html' with submission=vn %}</li>
{% endfor %}
</ul>
{% endif %}
@@ -64,9 +64,9 @@
</div>
<h3 class="mt-2">Submission summary</h3>
- {% include 'submissions/_submission_summary.html' with submission=submission hide_title=1 %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission hide_title=1 show_abstract=1 %}
- {% include 'submissions/_submission_status_block.html' with submission=submission %}
+ {% include 'partials/submissions/submission_status.html' with submission=submission %}
<br>
<br>
@@ -96,14 +96,14 @@
{% if is_author or user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' %}
{% for recommendation in recommendations %}
{% if user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' or recommendation|is_viewable_by_authors %}
- {% include 'submissions/_recommendation_author_content.html' with recommendation=recommendation %}
+ {% include 'partials/submissions/recommendation_author_content.html' with recommendation=recommendation %}
{% endif %}
{% endfor %}
<div class="mb-4">
<h2>Events</h2>
<div id="eventslist">
- {% include 'submissions/submission_event_list.html' with events=submission.events.for_author %}
+ {% include 'partials/submissions/submission_events.html' with events=submission.events.for_author %}
</div>
</div>
{% endif %}
@@ -194,7 +194,7 @@
<div id="invitedreportslist">
{% for report in invited_reports %}
- {% include 'submissions/_single_public_report.html' with report=report user=request.user perms=perms %}
+ {% include 'partials/submissions/report_public.html' with report=report user=request.user perms=perms %}
{% endfor %}
</div>
@@ -216,7 +216,7 @@
<div id="contributedreportslist">
{% for report in contributed_reports %}
- {% include 'submissions/_single_public_report.html' with report=report user=request.user perms=perms %}
+ {% include 'partials/submissions/report_public.html' with report=report user=request.user perms=perms %}
{% endfor %}
</div>
diff --git a/submissions/templates/submissions/new_submission.html b/submissions/templates/submissions/submission_form.html
similarity index 100%
rename from submissions/templates/submissions/new_submission.html
rename to submissions/templates/submissions/submission_form.html
diff --git a/submissions/templates/submissions/submissions.html b/submissions/templates/submissions/submission_list.html
similarity index 100%
rename from submissions/templates/submissions/submissions.html
rename to submissions/templates/submissions/submission_list.html
diff --git a/submissions/templates/submissions/prefill_using_identifier.html b/submissions/templates/submissions/submission_prefill_form.html
similarity index 100%
rename from submissions/templates/submissions/prefill_using_identifier.html
rename to submissions/templates/submissions/submission_prefill_form.html
diff --git a/submissions/templates/submissions/submissions_by_status.html b/submissions/templates/submissions/submissions_by_status.html
deleted file mode 100644
index f6e10422fd989f7627f263ff9e8d2659901ec62c..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/submissions_by_status.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends 'submissions/_pool_base.html' %}
-
-{% load guardian_tags %}
-{% load scipost_extras %}
-{% load submissions_extras %}
-
-{% block pagetitle %}: Submissions by status{% endblock pagetitle %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
- <span class="breadcrumb-item">Status: {{status}}</span>
-{% endblock %}
-
-{% block content %}
-
-{% with is_ECAdmin=request.user|is_in_group:'Editorial Administrators' %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">SciPost Submissions with status {{status}}</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <!-- Submissions list -->
- {% for sub in submissions_of_status %}
- <div class="card card-outline-secondary mt-1">
- {% include 'submissions/_submission_card_in_pool.html' with submission=sub remark_form=remark_form is_ECAdmin=is_ECAdmin %}
- </div>
- {% endfor %}
- </div>
-</div>
-{% endwith %}
-
-{% endblock content %}
diff --git a/submissions/templates/submissions/treated_submissions_list.html b/submissions/templates/submissions/treated_submission_list.html
similarity index 100%
rename from submissions/templates/submissions/treated_submissions_list.html
rename to submissions/templates/submissions/treated_submission_list.html
diff --git a/submissions/templates/submissions/treated_submission_pdf_compile.html b/submissions/templates/submissions/treated_submission_pdf_compile.html
index 19e456fefbb06e35c872c25f1cc8c53e0020ea62..8412eed0c6aa982c23f6e9ac7268c078f70a9561 100644
--- a/submissions/templates/submissions/treated_submission_pdf_compile.html
+++ b/submissions/templates/submissions/treated_submission_pdf_compile.html
@@ -15,7 +15,7 @@
<div class="row">
<div class="col-12">
<h1 class="highlight">Upload Submission Refereeing PDF</h1>
- {% include 'submissions/_submission_summary_short.html' with submission=submission %}
+ {% include 'partials/submissions/submission_summary.html' with submission=submission %}
<p class="my-2"><a href="{{submission.get_absolute_url}}">Go to Submission page</a></p>
</div>
</div>
@@ -33,7 +33,7 @@
Number of Reports: {{submission.reports.accepted.count}}<br>
Number of Comments <small>(nested comments not counted)</small>: {{submission.comments.vetted.count}}
</p>
- <pre class="clickfocus" style="max-height: 200px;"><code>{% include 'submissions/_refereeing_pack_tex_template.html' with submission=submission %}</code></pre>
+ <pre class="clickfocus" style="max-height: 200px;"><code>{% include 'partials/submissions/refereeing_pack_tex_template.html' with submission=submission %}</code></pre>
</div>
</div>
diff --git a/submissions/templates/submissions/vet_submitted_report.html b/submissions/templates/submissions/vet_submitted_report.html
index 3573610ada85ab771d66ff461358816098391cc2..eafd26b8ed3116b2e6f694ae274bc3bfe3739767 100644
--- a/submissions/templates/submissions/vet_submitted_report.html
+++ b/submissions/templates/submissions/vet_submitted_report.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_pool_base.html' %}
+{% extends 'submissions/pool/base.html' %}
{% block pagetitle %}: vet reports{% endblock pagetitle %}
@@ -39,13 +39,13 @@ $(document).ready(function(){
<h2 class="mb-2">Submission associated to Report:</h2>
<div class="row">
<div class="col-12">
- {% include 'submissions/_submission_summary_short.html' with submission=report_to_vet.submission %}
+ {% include 'partials/submissions/submission_summary.html' with submission=report_to_vet.submission %}
</div>
</div>
<h2 class="mb-2">Report to vet:</h2>
- {% include 'submissions/_single_public_report_without_comments.html' with submission=report_to_vet.submission report=report_to_vet %}
+ {% include 'partials/submissions/report_public_without_comments.html' with submission=report_to_vet.submission report=report_to_vet %}
<hr class="small">
<h2>Please vet this Report:</h2>
diff --git a/submissions/templates/submissions/vet_submitted_reports_list.html b/submissions/templates/submissions/vet_submitted_reports_list.html
index 44697fdc21432a4a36b1278ec934c860a152b40f..472b2039926efc55299ce7184123f58d91bc1e04 100644
--- a/submissions/templates/submissions/vet_submitted_reports_list.html
+++ b/submissions/templates/submissions/vet_submitted_reports_list.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_pool_base.html' %}
+{% extends 'submissions/pool/base.html' %}
{% block pagetitle %}: vet reports{% endblock pagetitle %}
diff --git a/submissions/views.py b/submissions/views.py
index 1f6c893527418e40a7d468631be2051d75e0bd54..813cb8e31aff54214618e413461e2e0ebc71ae5b 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -59,7 +59,7 @@ import strings
class RequestSubmission(CreateView):
success_url = reverse_lazy('scipost:personal_page')
form_class = RequestSubmissionForm
- template_name = 'submissions/new_submission.html'
+ template_name = 'submissions/submission_form.html'
def get(self, request):
return redirect('submissions:prefill_using_identifier')
@@ -117,17 +117,16 @@ def prefill_using_arxiv_identifier(request):
context = {
'form': form,
}
- return render(request, 'submissions/new_submission.html', context)
+ return render(request, 'submissions/submission_form.html', context)
context = {
'form': query_form,
}
- return render(request, 'submissions/prefill_using_identifier.html', context)
+ return render(request, 'submissions/submission_prefill_form.html', context)
class SubmissionListView(PaginationMixin, ListView):
model = Submission
- template_name = 'submissions/submissions.html'
form = SubmissionSearchForm
submission_search_list = []
paginate_by = 10
@@ -281,7 +280,7 @@ def reports_accepted_list(request):
context = {
'reports': reports
}
- return render(request, 'submissions/reports_accepted_list.html', context)
+ return render(request, 'submissions/admin/report_list.html', context)
@permission_required('scipost.can_manage_reports', raise_exception=True)
@@ -296,7 +295,7 @@ def report_pdf_compile(request, report_id):
'report': report,
'form': form
}
- return render(request, 'submissions/reports_pdf_compile.html', context)
+ return render(request, 'submissions/admin/report_compile_form.html', context)
@permission_required('scipost.can_manage_reports', raise_exception=True)
@@ -309,7 +308,7 @@ def treated_submissions_list(request):
context = {
'submissions': submissions
}
- return render(request, 'submissions/treated_submissions_list.html', context)
+ return render(request, 'submissions/treated_submission_list.html', context)
@permission_required('scipost.can_manage_reports', raise_exception=True)
@@ -447,7 +446,7 @@ def assign_submission(request, arxiv_identifier_w_vn_nr):
'submission_to_assign': submission,
'form': form
}
- return render(request, 'submissions/assign_submission.html', context)
+ return render(request, 'submissions/admin/editorial_assignment_form.html', context)
@login_required
@@ -618,7 +617,7 @@ def assignment_failed(request, arxiv_identifier_w_vn_nr):
form = ModifyPersonalMessageForm()
context = {'submission': submission,
'form': form}
- return render(request, 'submissions/assignment_failed.html', context)
+ return render(request, 'submissions/admin/editorial_assignment_failed.html', context)
@login_required
@@ -668,7 +667,7 @@ def editorial_page(request, arxiv_identifier_w_vn_nr):
'cycle_choice_form': SubmissionCycleChoiceForm(instance=submission),
'full_access': full_access,
}
- return render(request, 'submissions/editorial_page.html', context)
+ return render(request, 'submissions/pool/editorial_page.html', context)
@login_required
@@ -742,7 +741,7 @@ def select_referee(request, arxiv_identifier_w_vn_nr):
'ref_search_form': ref_search_form,
'queryresults': queryresults
})
- return render(request, 'submissions/select_referee.html', context)
+ return render(request, 'submissions/referee_form.html', context)
@login_required
@@ -940,7 +939,7 @@ def accept_or_decline_ref_invitations(request, invitation_id=None):
'invitation': invitation,
'form': form
}
- return render(request, 'submissions/accept_or_decline_ref_invitations.html', context)
+ return render(request, 'submissions/referee_invitations_form.html', context)
def decline_ref_invitation(request, invitation_key):
@@ -954,7 +953,7 @@ def decline_ref_invitation(request, invitation_key):
# User filled in: Accept
messages.warning(request, 'Please login and go to your personal page if you'
' want to accept the invitation.')
- return render(request, 'submissions/decline_ref_invitation.html', context)
+ return render(request, 'submissions/referee_invitations_decline.html', context)
invitation.accepted = False
invitation.refusal_reason = form.cleaned_data['refusal_reason']
@@ -970,7 +969,7 @@ def decline_ref_invitation(request, invitation_key):
messages.success(request, 'Thank you for informing us that you will not provide a Report.')
return redirect(reverse('scipost:index'))
- return render(request, 'submissions/decline_ref_invitation.html', context)
+ return render(request, 'submissions/referee_invitations_decline.html', context)
@login_required
@@ -1317,7 +1316,7 @@ def submit_report(request, arxiv_identifier_w_vn_nr):
'You may carry on working on it,'
' or leave the page and finish it later.'))
context = {'submission': submission, 'form': form}
- return render(request, 'submissions/submit_report.html', context)
+ return render(request, 'submissions/report_form.html', context)
# Send mails if report is submitted
SubmissionUtils.load({'report': newreport}, request)
@@ -1332,7 +1331,7 @@ def submit_report(request, arxiv_identifier_w_vn_nr):
return redirect(submission.get_absolute_url())
context = {'submission': submission, 'form': form}
- return render(request, 'submissions/submit_report.html', context)
+ return render(request, 'submissions/report_form.html', context)
@login_required