From 1fdc1af27cc6f074528aba35e51cd5bd21965a71 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 12 Jun 2017 20:07:17 +0200
Subject: [PATCH] Improve partners
---
partners/constants.py | 1 +
partners/forms.py | 4 +--
.../migrations/0012_auto_20170612_2006.py | 30 +++++++++++++++++++
.../email/email_prospartner_contact.html | 2 +-
.../email/email_prospartner_contact_html.html | 2 +-
5 files changed, 35 insertions(+), 4 deletions(-)
create mode 100644 partners/migrations/0012_auto_20170612_2006.py
diff --git a/partners/constants.py b/partners/constants.py
index 148ac6556..0ca4dda01 100644
--- a/partners/constants.py
+++ b/partners/constants.py
@@ -12,6 +12,7 @@ PARTNER_KINDS = (
(PARTNER_KIND_UNI_LIBRARY, 'University (and its Library)'),
('Res. Library', 'Research Library'),
('Prof. Soc.', 'Professional Society'),
+ ('Nat. Consor.', 'National Consortium'),
('Foundation', 'Foundation'),
('Individual', 'Individual'),
)
diff --git a/partners/forms.py b/partners/forms.py
index a09a6b424..1288e96d8 100644
--- a/partners/forms.py
+++ b/partners/forms.py
@@ -41,10 +41,10 @@ class ProspectiveContactForm(forms.ModelForm):
class EmailProspectivePartnerContactForm(forms.Form):
email_subject = forms.CharField(widget=forms.Textarea(),
- initial='SciPost Supporting Partners Board')
+ initial='Supporting Partners Board')
message = forms.CharField(widget=forms.Textarea(), required=False)
include_SPB_summary = forms.BooleanField(
- required=False, initial=False,
+ required=False, initial=True,
label='include SPB summary with message')
def __init__(self, *args, **kwargs):
diff --git a/partners/migrations/0012_auto_20170612_2006.py b/partners/migrations/0012_auto_20170612_2006.py
new file mode 100644
index 000000000..67e286ffc
--- /dev/null
+++ b/partners/migrations/0012_auto_20170612_2006.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-06-12 18:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0011_auto_20170609_2234'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='institution',
+ name='kind',
+ field=models.CharField(choices=[('Res. Inst.', 'Research Institute'), ('Int. Fund. Agency', 'International Funding Agency'), ('Nat. Fund. Agency', 'National Funding Agency'), ('Nat. Lab.', 'National Laboratory'), ('Nat. Library', 'National Library'), ('Nat. Acad.', 'National Academy'), ('Univ. Library', 'University (and its Library)'), ('Res. Library', 'Research Library'), ('Prof. Soc.', 'Professional Society'), ('Nat. Consor.', 'National Consortium'), ('Foundation', 'Foundation'), ('Individual', 'Individual')], max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='prospectivepartner',
+ name='kind',
+ field=models.CharField(choices=[('Res. Inst.', 'Research Institute'), ('Int. Fund. Agency', 'International Funding Agency'), ('Nat. Fund. Agency', 'National Funding Agency'), ('Nat. Lab.', 'National Laboratory'), ('Nat. Library', 'National Library'), ('Nat. Acad.', 'National Academy'), ('Univ. Library', 'University (and its Library)'), ('Res. Library', 'Research Library'), ('Prof. Soc.', 'Professional Society'), ('Nat. Consor.', 'National Consortium'), ('Foundation', 'Foundation'), ('Individual', 'Individual')], default='Univ. Library', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='prospectivepartnerevent',
+ name='event',
+ field=models.CharField(choices=[('requested', 'Requested (from online form)'), ('comment', 'Comment added'), ('email_sent', 'Email sent'), ('negotiating', 'Initiated negotiation'), ('marked_as_uninterested', 'Marked as uninterested'), ('promoted', 'Promoted to Partner')], max_length=64),
+ ),
+ ]
diff --git a/templates/email/email_prospartner_contact.html b/templates/email/email_prospartner_contact.html
index c971d4d2f..036f91713 100644
--- a/templates/email/email_prospartner_contact.html
+++ b/templates/email/email_prospartner_contact.html
@@ -15,7 +15,7 @@ You might by now have heard of SciPost, a recently-launched initiative aiming to
\n\nIt would be a privilege to welcome you as members of our Supporting Partners Board. I am hereby contacting you to enquire whether your institution would consider joining. Your support at this time is crucially required to make our initiative sustainable, and to help make it possible for the community to reap all the benefits deriving form its viable implementation.
-\n\nI will be happy to provide any required further details. I sincerely hope that SciPost will be able to count on your support.
+\n\nI will be happy to provide any required further details. If you are interested, you can simply get in touch via this address (partners@scipost.org). I sincerely hope that SciPost will be able to count on your support.
\n\nOn behalf of the SciPost Foundation,
\nProf. dr Jean-Sébastien Caux
diff --git a/templates/email/email_prospartner_contact_html.html b/templates/email/email_prospartner_contact_html.html
index f1dcf34b6..728f959d5 100644
--- a/templates/email/email_prospartner_contact_html.html
+++ b/templates/email/email_prospartner_contact_html.html
@@ -30,7 +30,7 @@
It would be a privilege to welcome you as members of our Supporting Partners Board. I am hereby contacting you to enquire whether your institution would consider joining. Your support at this time is crucially required to make our initiative sustainable, and to help make it possible for the community to reap all the benefits deriving form its viable implementation.
</p>
<p>
-I will be happy to provide any required further details. I sincerely hope that SciPost will be able to count on your support.
+I will be happy to provide any required further details. If you are interested, you can simply get in touch via this address (<a href="mailto:partners@scipost.org">partners@scipost.org</a>). I sincerely hope that SciPost will be able to count on your support.
</p>
<p>On behalf of the SciPost Foundation,</p>
Prof. dr Jean-Sébastien Caux
--
GitLab