Fix merge conflict

partners/admin.py

 from django.contrib import admin
 
-from .models import Contact, Partner, Consortium, ProspectivePartner, MembershipAgreement,\
-                    ProspectiveContact
-
+from .models import Contact, Partner, PartnerEvent, Consortium,\
+                    ProspectivePartner, ProspectiveContact, ProspectivePartnerEvent,\
+                    MembershipAgreement
 
 class ProspectiveContactInline(admin.TabularInline):
     model = ProspectiveContact
     extra = 0
 
-
-class PartnerAdmin(admin.ModelAdmin):
-    search_fields = ('institution', )
-
+class ProspectivePartnerEventInline(admin.TabularInline):
+    model = ProspectivePartnerEvent
 
 class ProspectivePartnerAdmin(admin.ModelAdmin):
-    inlines = (ProspectiveContactInline,)
+    inlines = (ProspectiveContactInline, ProspectivePartnerEventInline,)
     list_display = ('institution_name', 'date_received', 'status')
     list_filter = ('kind', 'status')
 
 
+class PartnerAdmin(admin.ModelAdmin):
+    search_fields = ('institution', )
+
+
 admin.site.register(Partner, PartnerAdmin)
 admin.site.register(Contact)
 admin.site.register(Consortium)

partners/models.py

@@ -85,7 +85,6 @@ class ProspectivePartnerEvent(models.Model):
     def __str__(self):
         return '%s: %s' % (self.prospartner, self.get_event_display())
 
-
 ###########################
 # Partner-related objects #
 ###########################

scipost/templates/scipost/about.html

@@ -95,7 +95,7 @@
     <div class="col-md-3 offset-md-1">
       <h3><a href="{% url 'scipost:foundation' %}">The SciPost Foundation</a></h3>
       <ul>
-    	<li>Chairman: Prof. J.-S. Caux</li>
+    	<li>Chairman: Prof. <a href="http://jscaux.org">J.-S. Caux</a></li>
     	<li>Secretary: Dr J. van Mameren</li>
     	<li>Treasurer: Dr J. van Wezel</li>
       </ul>

templates/email/email_prospartner_contact.html

@@ -4,21 +4,22 @@ Dear {{ contact.get_title_display }} {{ contact.last_name }}, \n\n
 
 {% if include_SPB_summary %}
 You might by now have heard of SciPost, a recently-launched initiative aiming to bring disruptive change to current academic publishing practices.
-\n\nIn summary, SciPost.org is a publication portal managed by professional scientists, offering (among others) high-quality Open Access journals with innovative forms of refereeing, and a means of commenting on all existing literature. SciPost is established as a not-for-profit foundation devoted to serving the interests of the international scientific community.
+\n\nIn summary, SciPost is a publication portal managed by professional scientists, offering (among others) high-quality Open Access journals with innovative forms of refereeing, and a means of commenting on all existing literature. SciPost is established as a not-for-profit foundation devoted to serving the interests of the international scientific community.
 \n\nThe site is anchored at https://scipost.org. Many further details about SciPost, its principles, ideals and implementation can be found at https://scipost.org/about and https://scipost.org/FAQ.
 
-\n\nCrucially, as explained on our Partners page at https://scipost.org/partners, SciPost follows a completely different funding model than traditional publishers, and provides a cost-slashing alternative to existing platforms. SciPost charges neither subscription fees, nor article processing charges; its activities are instead to be financed through a Supporting Partners Board, formed by a worldwide collection of institutions and organizations which directly or indirectly benefit from SciPost’s activities.
+\n\nCrucially, as explained on our Partners page at https://scipost.org/partners, SciPost follows a completely different funding model than traditional publishers, and provides a cost-slashing alternative to existing platforms. SciPost charges neither subscription fees, nor article processing charges; its activities are instead to be collectively financed through a Supporting Partners Board, formed by a worldwide consortium of institutions and organizations which directly or indirectly benefit from SciPost’s activities.
 
 \n\nSupport takes the form of a small financial commitment, collectively pooled to enable SciPost to perform all its publication-related activities, maintain its online portal and implement its long-term development plan.
 
 \n\nIn the agreement template, which you can find online at https://scipost.org/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf, you will find many more specific details about our operations, requirements and funding strategy. I would greatly appreciate if you took a few minutes to read through this document.
 
-\n\nIt would be a privilege to welcome you as members of our Supporting Partners Board, and are hereby contacting you to enquire whether your institution would consider joining. Your support at this time is crucially required to make our initiative viable, and to help make it possible for the community to reap all the benefits deriving form its viable implementation.
+\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. In the meantime, I send you my best wishes and sincerely hope that SciPost will be able to count on your support.
+\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\nOn behalf of the SciPost Foundation,
-\n\nProf. dr Jean-Sébastien Caux
+\nProf. dr Jean-Sébastien Caux
+\nhttp://jscaux.org
 \n---------------------------------------------
 \nInstitute for Theoretial Physics\nUniversity of Amsterdam
 \nScience Park 904\n1098 XH Amsterdam\nThe Netherlands

templates/email/email_prospartner_contact_html.html

@@ -12,13 +12,13 @@
   You might by now have heard of SciPost, a recently-launched initiative aiming to bring disruptive change to current academic publishing practices.
 </p>
 <p>
-  In summary, SciPost.org is a publication portal managed by professional scientists, offering (among others) high-quality Open Access journals with innovative forms of refereeing, and a means of commenting on all existing literature. SciPost is established as a not-for-profit foundation devoted to serving the interests of the international scientific community.
+  In summary, SciPost is a publication portal managed by professional scientists, offering (among others) high-quality Open Access journals with innovative forms of refereeing, and a means of commenting on all existing literature. SciPost is established as a not-for-profit foundation devoted to serving the interests of the international scientific community.
 </p>
 <p>
   The site is anchored at <a href="https://scipost.org">SciPost.org</a>. Many further details about SciPost, its principles, ideals and implementation can be found on the <a href="https://scipost.org/about">about</a> and <a href="https://scipost.org/FAQ">FAQ</a> pages.
 </p>
 <p>
-  Crucially, as explained on our <a href="https://scipost.org/partners">Partners page</a>, SciPost follows a completely different funding model than traditional publishers, and provides a cost-slashing alternative to existing platforms. SciPost charges neither subscription fees, nor article processing charges; its activities are instead to be financed through a Supporting Partners Board, formed by a worldwide collection of institutions and organizations which directly or indirectly benefit from SciPost’s activities.
+  Crucially, as explained on our <a href="https://scipost.org/partners">Partners page</a>, SciPost follows a completely different funding model than traditional publishers, and provides a cost-slashing alternative to existing platforms. SciPost charges neither subscription fees, nor article processing charges; its activities are instead to be collectively financed through a Supporting Partners Board, formed by a worldwide consortium of institutions and organizations which directly or indirectly benefit from SciPost’s activities.
 </p>
 <p>
   Support takes the form of a small financial commitment, collectively pooled to enable SciPost to perform all its publication-related activities, maintain its online portal and implement its long-term development plan.
@@ -27,13 +27,14 @@
   In the <a href="{% static 'scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf' %}">agreement template</a>, you will find many more specific details about our operations, requirements and funding strategy. I would greatly appreciate if you took a few minutes to read through this document.
 </p>
 <p>
-  It would be a privilege to welcome you as members of our Supporting Partners Board, and are hereby contacting you to enquire whether your institution would consider joining. Your support at this time is crucially required to make our initiative viable, and to help make it possible for the community to reap all the benefits deriving form its viable implementation.
+  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. In the meantime, I send you my best wishes and sincerely hope that SciPost will be able to count on your support.
+I will be happy to provide any required further details. I sincerely hope that SciPost will be able to count on your support.
 </p>
 <p>On behalf of the SciPost Foundation,</p>
-<br/>Prof. dr Jean-S&eacute;bastien Caux
+Prof. dr Jean-S&eacute;bastien Caux
+<br/><a href="http://jscaux.org">jscaux.org</a>
 <br/>---------------------------------------------
 <br/>Institute for Theoretial Physics
 <br/>University of Amsterdam