diff --git a/journals/templates/journals/journals_terms_and_conditions.html b/journals/templates/journals/journals_terms_and_conditions.html
index e445c92cb1b4521ff109ecc8f905dea6dbaa28bd..d17532cf3707e1cae242f4c23619cad050b23134 100644
--- a/journals/templates/journals/journals_terms_and_conditions.html
+++ b/journals/templates/journals/journals_terms_and_conditions.html
@@ -24,7 +24,7 @@
<li>The manuscript which is submitted for publication has not been published before except in
the form of an abstract or electronic preprint or other similar formats which have not undergone
peer review. It is also not under consideration elsewhere for peer-reviewed publication.</li>
- <li>Each submission will automatically be checked for plagiarism. In their own interest, authors
+ <li>Each submission will automatically be checked for plagiarism: SciPost is a Participating Publisher of Crossref's Similarity Check. In their own interest, authors
should avoid any ambiguous case by clearly quoting and citing original sources.</li>
<li>The submission has been approved by all authors and tacitly or explicitly by the relevant
authorities and/or institutes where the work was carried out.</li>
diff --git a/journals/templates/journals/publication_detail.html b/journals/templates/journals/publication_detail.html
index 4af2ca735b75247bdd1b2da21a9de02343cbdaed..2250369295574195a8cd2e324bc42def44b576a6 100644
--- a/journals/templates/journals/publication_detail.html
+++ b/journals/templates/journals/publication_detail.html
@@ -25,7 +25,7 @@
<li><a href="{% url 'journals:create_citation_list_metadata' doi_string=publication.doi_string%}">Create/update citation list metadata</a></li>
<li><a href="{% url 'journals:create_funding_info_metadata' doi_string=publication.doi_string%}">Create/update funding info metadata</a></li>
<li><a href="{% url 'journals:create_metadata_xml' doi_string=publication.doi_string %}">Create/update the XML metadata</a></li>
- <li><a href="{% url 'journals:test_metadata_xml_deposit' doi_string=publication.doi_string %}">Test metadata deposit (via Crossref test server)</li>
+ <li><a href="{% url 'journals:test_metadata_xml_deposit' doi_string=publication.doi_string %}">Test metadata deposit (via Crossref test server)</a></li>
</ul>
{% endif %}
diff --git a/scipost/admin.py b/scipost/admin.py
index d4cc870918c31f37488549e89c12b558f5a3e652..ec35d7acd0690dd8048aa9ee84614430cb0cbfa3 100644
--- a/scipost/admin.py
+++ b/scipost/admin.py
@@ -82,6 +82,12 @@ class GraphAdmin(GuardedModelAdmin):
admin.site.register(Graph, GraphAdmin)
+class AffiliationObjectAdmin(admin.ModelAdmin):
+ search_fields = ['country', 'institution', 'subunit']
+
+admin.site.register(AffiliationObject, AffiliationObjectAdmin)
+
+
class SPBMembershipAgreementInline(admin.StackedInline):
model = SPBMembershipAgreement
diff --git a/scipost/forms.py b/scipost/forms.py
index 3da7f526fb7402c550fb9d7c44534ce039574309..0e64f202c4f7521e5cb5b78ebebdac9d39f2046c 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -318,19 +318,24 @@ class SupportingPartnerForm(forms.ModelForm):
class SPBMembershipForm(forms.ModelForm):
class Meta:
model = SPBMembershipAgreement
- fields = ['start_date', 'duration',]
+ fields = ['start_date', 'duration', 'offered_yearly_contribution']
def __init__(self, *args, **kwargs):
super(SPBMembershipForm, self).__init__(*args, **kwargs)
self.fields['start_date'].widget.attrs.update({'placeholder': 'YYYY-MM-DD'})
+ self.fields['offered_yearly_contribution'].initial = 1000
self.helper = FormHelper()
self.helper.layout = Layout(
Div(
Div(
Field('start_date'),
- css_class="col-6"),
+ css_class="col-4"),
Div(
Field('duration'),
- css_class="col-6"),
+ css_class="col-2"),
+ Div(
+ Field('offered_yearly_contribution'),
+ HTML('(euros)'),
+ css_class="col-4"),
css_class="row"),
)
diff --git a/scipost/models.py b/scipost/models.py
index 5dbe6ee2a9fdcc4b67fcd742144de9da31f93e6a..a26a44486c9a455208b7478c19ae5c8c715a5cda 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -831,6 +831,15 @@ class Arc(models.Model):
+#######################
+# Affiliation Objects #
+#######################
+
+class AffiliationObject(models.Model):
+ country = CountryField()
+ institution = models.CharField(max_length=128)
+ subunit = models.CharField(max_length=128)
+
#############################
# Supporting Partners Board #
@@ -898,6 +907,7 @@ class SPBMembershipAgreement(models.Model):
date_requested = models.DateField()
start_date = models.DateField()
duration = models.DurationField(choices=SPB_MEMBERSHIP_DURATION)
+ offered_yearly_contribution = models.SmallIntegerField(default=0)
def __str__(self):
return (str(self.partner) +
diff --git a/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf b/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf
index fbf81a4bd669dd792279074d4ce8e7a909610508..042b661a679115369f9ee152cf626744eb8f3eea 100644
Binary files a/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf and b/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf differ
diff --git a/scipost/views.py b/scipost/views.py
index ad8a2849122bcff003783864e136dae5ddc07302..3295e8c32b8b7acdfbea0c6845898f38c3e87e96 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -1510,6 +1510,7 @@ def SPB_membership_request(request):
date_requested=timezone.now().date(),
start_date=membership_form.cleaned_data['start_date'],
duration=membership_form.cleaned_data['duration'],
+ offered_yearly_contribution=membership_form.cleaned_data['offered_yearly_contribution'],
)
agreement.save()
ack_message = ('Thank you for your SPB Membership request. '
diff --git a/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf b/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf
index fbf81a4bd669dd792279074d4ce8e7a909610508..042b661a679115369f9ee152cf626744eb8f3eea 100644
Binary files a/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf and b/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf differ