Merge branch 'master' of https://bitbucket.org/scipostdev/scipost_v1

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'),
 )

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):

partners/migrations/0012_auto_20170612_2006.py

+# -*- 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),
+        ),
+    ]

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

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&eacute;bastien Caux