diff --git a/scipost/forms.py b/scipost/forms.py
index 004f22b06d3433242797c15ef04d9d805d0eaaa8..3da7f526fb7402c550fb9d7c44534ce039574309 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -292,9 +292,45 @@ class SupportingPartnerForm(forms.ModelForm):
class Meta:
model = SupportingPartner
fields = ['partner_type', 'institution',
- 'institution_acronym', 'institution_address',]
+ 'institution_acronym', 'institution_address',
+ 'consortium_members',]
+
+ def __init__(self, *args, **kwargs):
+ super(SupportingPartnerForm, self).__init__(*args, **kwargs)
+ self.fields['institution_address'].widget = forms.Textarea({'rows': 8,})
+ self.fields['consortium_members'].widget.attrs.update(
+ {'placeholder': 'Please list the names of the institutions within the consortium',})
+ self.helper = FormHelper()
+ self.helper.layout = Layout(
+ Div(
+ Div(
+ Field('institution'),
+ Field('institution_acronym'),
+ Field('institution_address'),
+ css_class='col-6'),
+ Div(
+ Field('partner_type'),
+ Field('consortium_members'),
+ css_class='col-6'),
+ css_class='row')
+ )
class SPBMembershipForm(forms.ModelForm):
class Meta:
model = SPBMembershipAgreement
fields = ['start_date', 'duration',]
+
+ def __init__(self, *args, **kwargs):
+ super(SPBMembershipForm, self).__init__(*args, **kwargs)
+ self.fields['start_date'].widget.attrs.update({'placeholder': 'YYYY-MM-DD'})
+ self.helper = FormHelper()
+ self.helper.layout = Layout(
+ Div(
+ Div(
+ Field('start_date'),
+ css_class="col-6"),
+ Div(
+ Field('duration'),
+ css_class="col-6"),
+ css_class="row"),
+ )
diff --git a/scipost/models.py b/scipost/models.py
index 90682ab6a7bb636cd137677facab8cd9a8a3e79e..5dbe6ee2a9fdcc4b67fcd742144de9da31f93e6a 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -839,8 +839,10 @@ class Arc(models.Model):
PARTNER_TYPES = (
('Int. Fund. Agency', 'International Funding Agency'),
('Nat. Fund. Agency', 'National Funding Agency'),
+ ('Nat. Library', 'National Library'),
('Univ. Library', 'University Library'),
- ('Univ. Library. Consortium', 'University Library Consortium'),
+ ('Res. Library', 'Research Library'),
+ ('Consortium', 'Consortium'),
('Foundation', 'Foundation'),
('Individual', 'Individual'),
)
@@ -863,6 +865,7 @@ class SupportingPartner(models.Model):
institution = models.CharField(max_length=256)
institution_acronym = models.CharField(max_length=10)
institution_address = models.CharField(max_length=1000)
+ consortium_members = models.TextField(blank=True, null=True)
contact_person = models.ForeignKey(Contributor)
def __str__(self):
@@ -878,7 +881,9 @@ SPB_membership_agreement_status_dict = dict(SPB_MEMBERSHIP_AGREEMENT_STATUS)
SPB_MEMBERSHIP_DURATION = (
(datetime.timedelta(days=365), '1 year'),
+ (datetime.timedelta(days=730), '2 years'),
(datetime.timedelta(days=1095), '3 years'),
+ (datetime.timedelta(days=1460), '4 years'),
(datetime.timedelta(days=1825), '5 years'),
)
spb_membership_duration_dict = dict(SPB_MEMBERSHIP_DURATION)
diff --git a/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf b/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fbf81a4bd669dd792279074d4ce8e7a909610508
Binary files /dev/null and b/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf differ
diff --git a/scipost/templates/scipost/SPB_membership_request.html b/scipost/templates/scipost/SPB_membership_request.html
index 954923da5bb343bdb80db8aaef8c3cd1c226e942..9be4a6c3ed76c2f0c532f86da736a52c798bc0d6 100644
--- a/scipost/templates/scipost/SPB_membership_request.html
+++ b/scipost/templates/scipost/SPB_membership_request.html
@@ -6,6 +6,24 @@
{% block bodysup %}
+<script>
+$(document).ready(function(){
+ $("#div_id_consortium_members").hide()
+
+ $('select#id_partner_type').on('change', function (){
+ var selection = $(this).val();
+ switch(selection){
+ case "Consortium":
+ $("#div_id_consortium_members").show()
+ break;
+ default:
+ $("#div_id_consortium_members").hide()
+ }
+});
+});
+
+</script>
+
<section>
<div class="flex-container">
@@ -14,14 +32,22 @@
</div>
</div>
+ <p>You can hereby initiate the process to become one of our Supporting Partners.</p>
+ <p>After filling this form, SciPost Administration will contact you with a Partnership
+ Agreement offer.</p>
+ <p><em>Note: you will automatically be considered as the contact person for this Partner.</em></p>
+
{% if errormessage %}
<p style="color: red;">{{ errormessage }}</p>
{% endif %}
<form action="{% url 'scipost:SPB_membership_request' %}" method="post">
{% csrf_token %}
- {{ SP_form.as_p }}
- {{ membership_form.as_p }}
+ <h3>Partner details:</h3>
+ {% load crispy_forms_tags %}
+ {% crispy SP_form %}
+ <h3>Agreement terms:</h3>
+ {% crispy membership_form %}
<input type="submit" value="Submit"/>
</form>
diff --git a/scipost/templates/scipost/supporting_partners.html b/scipost/templates/scipost/supporting_partners.html
index fe6b68e47df2790e666162de55d2e441c52c9554..4c7ab5bf73a1735fbcf66cdf450bba5420d57ab9 100644
--- a/scipost/templates/scipost/supporting_partners.html
+++ b/scipost/templates/scipost/supporting_partners.html
@@ -14,7 +14,11 @@
</div>
</div>
- Interested parties can request Membership of the SciPost Supporting Partners Board by filling the <a href="{% url 'scipost:SPB_membership_request' %}">online request form</a>.
+ <p>The set of all Supporting Partners forms the SciPost Supporting Partners Board (SPB). Acting as a representative body, the SPB’s purpose is to provide the main financial backing without which SciPost could not continue carrying out its mission, to counsel it in all its operations and to help determine the initiative’s development priorities.</p>
+
+ <p>Interested parties can join the SciPost Supporting Partners Board by signing a <a href="{% static 'scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf' %}">Partner Agreement</a>.</p>
+
+ <p>Membership can be requested by filling the <a href="{% url 'scipost:SPB_membership_request' %}">online request form</a>.</p>
</section>
diff --git a/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf b/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fbf81a4bd669dd792279074d4ce8e7a909610508
Binary files /dev/null and b/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf differ
diff --git a/static/scipost/SciPost.css b/static/scipost/SciPost.css
index 211ca1b94fa6a5d84919104663ca2170320bbbe6..1009c36ff6d9fb82a9340f615456ddcf55565e56 100644
--- a/static/scipost/SciPost.css
+++ b/static/scipost/SciPost.css
@@ -74,6 +74,24 @@ ul.personalTabMenu li a.inactive {
border: none;
}
+.assignments_listing {
+ border-collapse: collapse;
+ margin: 0px 5px;
+ padding: 0px;
+}
+.assignments_listing tr {
+ background-color: #dddddd;
+ border: 1px solid black;
+}
+.assignments_listing td {
+ border: 1px solid black;
+ padding: 4px 8px;
+}
+.assignments_listing th {
+ border: 1px solid black;
+ padding: 4px 8px;
+}
+
.commentcategorychoices {
list-style-type: none;
}
@@ -279,6 +297,10 @@ ul.personalTabMenu li a.inactive {
background-color: #f0f0f0;
padding: 0px 4px;
}
+.tableofInviteesDeclined td {
+ background-color: #e09090;
+ padding: 0px 4px;
+}
body {
/* font-family: Merriweather, sans-serif; */
@@ -838,3 +860,23 @@ li.publicationPDF {
background: #999999;
}
+#preview-comment_text {
+ border: 1px solid black;
+ white-space: pre-wrap;
+}
+#preview-strengths {
+ border: 1px solid black;
+ white-space: pre-wrap;
+}
+#preview-weaknesses {
+ border: 1px solid black;
+ white-space: pre-wrap;
+}
+#preview-report {
+ border: 1px solid black;
+ white-space: pre-wrap;
+}
+#preview-requested_changes {
+ border: 1px solid black;
+ white-space: pre-wrap;
+}
\ No newline at end of file
diff --git a/static/scipost/info/SciPost_Business_Plan_2016_08.pdf b/static/scipost/info/SciPost_Business_Plan_2016_08.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..887753cd0dc51c5af519b96be0727d8516e0c39f
Binary files /dev/null and b/static/scipost/info/SciPost_Business_Plan_2016_08.pdf differ
diff --git a/static/scipost/info/afschrift_OPR_St_SciPost.pdf b/static/scipost/info/afschrift_OPR_St_SciPost.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..2946d8535758abb0e8ac7b3a8c74bcfb56969d99
Binary files /dev/null and b/static/scipost/info/afschrift_OPR_St_SciPost.pdf differ
diff --git a/static/scipost/info/uittreksel_Stichting_SciPost.pdf b/static/scipost/info/uittreksel_Stichting_SciPost.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..1989cd1366ed337765ef7031034252fd7833ae39
Binary files /dev/null and b/static/scipost/info/uittreksel_Stichting_SciPost.pdf differ