diff --git a/comments/migrations/0010_auto_20170216_1831.py b/comments/migrations/0010_auto_20170216_1831.py new file mode 100644 index 0000000000000000000000000000000000000000..2a44e624ab9cbfb9c17af0907de9493ab2e19ccb --- /dev/null +++ b/comments/migrations/0010_auto_20170216_1831.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-02-16 17:31 +from __future__ import unicode_literals + +import comments.behaviors +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('comments', '0009_auto_20170212_2025'), + ] + + operations = [ + migrations.AlterField( + model_name='comment', + name='author', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='scipost.Contributor'), + ), + migrations.AlterField( + model_name='comment', + name='file_attachment', + field=models.FileField(blank=True, upload_to='uploads/comments/%Y/%m/%d/', validators=[comments.behaviors.validate_file_extension, comments.behaviors.validate_max_file_size]), + ), + ] diff --git a/journals/views.py b/journals/views.py index 8a55ad6b3a4c58eddfdd9e9b64ecd106813deac9..77c1df2b0b48ffc596807004214966204c6c898a 100644 --- a/journals/views.py +++ b/journals/views.py @@ -222,7 +222,7 @@ def validate_publication(request): publication.save() # Move file to final location initial_path = publication.pdf_file.path - new_dir = (publication.in_issue.path + '/' + new_dir = (settings.MEDIA_ROOT + publication.in_issue.path + '/' + paper_nr_string(publication.paper_nr)) new_path = new_dir + '/' + publication.doi_label.replace('.', '_') + '.pdf' os.makedirs(new_dir) @@ -242,8 +242,7 @@ def validate_publication(request): return render(request, 'scipost/acknowledgement.html', context) else: errormessage = 'The form was invalid.' - context = {'publication': publication, - 'validate_publication_form': validate_publication_form, + context = {'validate_publication_form': validate_publication_form, 'errormessage': errormessage} return render(request, 'journals/validate_publication.html', context) else: diff --git a/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf b/scipost/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf index 042b661a679115369f9ee152cf626744eb8f3eea..e8ad02b0b00bddb765b1934b499a21581cc02126 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/templates/scipost/SPB_membership_request.html b/scipost/templates/scipost/SPB_membership_request.html index 455ce5b04347aeaae62171bcc03432c5f58adc77..2048761d33e9e9e89f7d71d9ba4181d756e24c01 100644 --- a/scipost/templates/scipost/SPB_membership_request.html +++ b/scipost/templates/scipost/SPB_membership_request.html @@ -3,21 +3,24 @@ {% block pagetitle %}: Supporting Partners Board: Membership request{% endblock pagetitle %} {% load staticfiles %} - +{% load bootstrap %} {% block bodysup %} <script> $(document).ready(function(){ - $("#div_id_consortium_members").hide() + $("#id_consortium_members").hide() + $("label[for='id_consortium_members']").hide() $('select#id_partner_type').on('change', function (){ var selection = $(this).val(); switch(selection){ case "Consortium": - $("#div_id_consortium_members").show() + $("#id_consortium_members").show() + $("label[for='id_consortium_members']").show() break; default: - $("#div_id_consortium_members").hide() + $("#id_consortium_members").hide() + $("label[for='id_consortium_members']").hide() } }); }); @@ -48,11 +51,11 @@ $(document).ready(function(){ <form action="{% url 'scipost:SPB_membership_request' %}" method="post"> {% csrf_token %} <h3>Partner details:</h3> - {% load crispy_forms_tags %} - {% crispy SP_form %} + + {{ SP_form|bootstrap }} <h3>Agreement terms:</h3> - {% crispy membership_form %} - <input type="submit" value="Submit"/> + {{ membership_form|bootstrap }} + <input class="btn btn-secondary" type="submit" value="Submit"/> </form> </div> diff --git a/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf b/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf index 042b661a679115369f9ee152cf626744eb8f3eea..e8ad02b0b00bddb765b1934b499a21581cc02126 100644 Binary files a/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf and b/static/scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf differ