From: Guillaume Pellerin Date: Fri, 10 Mar 2017 17:08:40 +0000 (+0100) Subject: update Project form X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4c4a1e26f9a837baee912bbc7d48d497eed2214c;p=mezzo.git update Project form --- diff --git a/app/organization/projects/forms.py b/app/organization/projects/forms.py index 8467ab14..c878e37a 100644 --- a/app/organization/projects/forms.py +++ b/app/organization/projects/forms.py @@ -60,33 +60,31 @@ class ProjectForm(ModelForm): fields = ('title', 'description', 'keywords', 'website') -class ProjectICTForm(ModelForm): - - class Meta: - model = Project - exclude = ('external_id', '_meta_title') - - class ProjectICTDataInline(InlineFormSet): max_num = 1 model = ProjectICTData - exclude = ('validation_status', ) - + prefix = 'ICT data' + can_delete = False + fields = '__all__' class ProjectSimpleImageInline(InlineFormSet): - max_num = 3 + max_num = 4 model = ProjectSimpleImage - fields = ('file', 'credits') + prefix = 'Images' + can_delete = False + fields = ['file', 'credits'] class ProjectContactInline(InlineFormSet): max_num = 1 model = ProjectContact - fields = ('gender', 'person_title', 'first_name', 'last_name', 'address', 'email', 'telephone', 'bio', 'address', 'postal_code', 'city', 'country') - + prefix = 'Contact' + can_delete = False + fields = ['gender', 'person_title', 'first_name', 'last_name', 'address', 'email', + 'telephone', 'address', 'postal_code', 'city', 'country'] class ProducerForm(ModelForm): diff --git a/app/organization/projects/migrations/0049_auto_20170310_1658.py b/app/organization/projects/migrations/0049_auto_20170310_1658.py new file mode 100644 index 00000000..2c129e49 --- /dev/null +++ b/app/organization/projects/migrations/0049_auto_20170310_1658.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.11 on 2017-03-10 15:58 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-projects', '0048_auto_20170307_1540'), + ] + + operations = [ + migrations.RemoveField( + model_name='projectictdata', + name='validation_status', + ), + migrations.AddField( + model_name='project', + name='validation_status', + field=models.IntegerField(choices=[(0, 'rejected'), (1, 'pending'), (2, 'in process'), (3, 'accepted')], default=1, verbose_name='validation status'), + ), + ] diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py index d113b487..75a2c520 100644 --- a/app/organization/projects/models.py +++ b/app/organization/projects/models.py @@ -47,10 +47,10 @@ REPOSITORY_ACCESS_CHOICES = [ ] PROJECT_STATUS_CHOICES = ( - (0, _('pending')), - (1, _('accepted')), - (2, _('rejected')), - (3, _('in process')) + (0, _('rejected')), + (1, _('pending')), + (2, _('in process')), + (3, _('accepted')), ) @@ -70,6 +70,7 @@ class Project(Displayable, Period, RichText): topic = models.ForeignKey('ProjectTopic', verbose_name=_('topic'), related_name='projects', blank=True, null=True) referring_person = models.ManyToManyField('organization-network.Person', verbose_name=_('Referring Person'), related_name='projects_referring_person', blank=True) manager = models.ManyToManyField('organization-network.Person', verbose_name=_('Manager'), related_name='projects_manager', blank=True) + validation_status = models.IntegerField(_('validation status'), choices=PROJECT_STATUS_CHOICES, default=1) class Meta: verbose_name = _('project') @@ -345,7 +346,6 @@ class ProjectICTData(models.Model): # Private letter = models.TextField(_('letter of commitment')) - validation_status = models.IntegerField(_('validation status'), choices=PROJECT_STATUS_CHOICES) class Meta: verbose_name = 'Project ICT data' diff --git a/app/themes/base/static/src/sass/global/_typography.scss b/app/themes/base/static/src/sass/global/_typography.scss index b4d0c484..9b0a83c3 100755 --- a/app/themes/base/static/src/sass/global/_typography.scss +++ b/app/themes/base/static/src/sass/global/_typography.scss @@ -181,7 +181,7 @@ hr { border: 0; - height: 11px; + height: 1px; background-color: $color-main; @include margin(5 0 2 0); diff --git a/app/themes/vertigo_starts_eu/templates/projects/project_call_detail.html b/app/themes/vertigo_starts_eu/templates/projects/project_call_detail.html index 459baf08..f8f0aa4c 100644 --- a/app/themes/vertigo_starts_eu/templates/projects/project_call_detail.html +++ b/app/themes/vertigo_starts_eu/templates/projects/project_call_detail.html @@ -116,7 +116,7 @@ {% block page_sub_content %} {% with object.blocks.all as blocks %} - {% include "projects/inc/project_block.html" %} + {% include "core/inc/block.html" %} {% endwith %} {% endblock %} diff --git a/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html b/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html index 1f0e9402..f4e123d8 100644 --- a/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html +++ b/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html @@ -19,26 +19,29 @@ {% block page_title %} {% editable object.title %} -

{% trans "New project form" %}

+

{% trans "Framework and submission process for hosting R&D Projects" %}

{% endeditable %} {% endblock %} {% block page_content %}
- {% if object.content %} - {% editable object.content %} + {% if call.project_form_content %} + {% editable call.project_form_content %} {{ call.project_form_content|richtext_filters|safe }} {% endeditable %} {% endif %}
+

{% trans "Project submission form" %}

{% errors_for form %}
{% fields_for form %} {% for formset in inlines %} {{ formset.management_form }} +
+

{{ formset.prefix }}

{% for form in formset %} {% fields_for form %} {% endfor %} diff --git a/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/pages/menus/header.html b/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/pages/menus/header.html index 0676e819..94084d5d 100644 --- a/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/pages/menus/header.html +++ b/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/pages/menus/header.html @@ -52,9 +52,9 @@ {#
  • #} {# {% include "includes/languages.html" %}#} {#
    • #} -
  • + {#
  • -
    • + #} {% endif %} diff --git a/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/pages/page.html b/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/pages/page.html index d236815a..af1ced3a 100644 --- a/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/pages/page.html +++ b/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/pages/page.html @@ -37,10 +37,12 @@
    + {% comment %}
    {% block page_sidebar %} {% endblock %}
    + {% endcomment %}
    diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index 677c2fae..d94d8e65 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit 677c2faeb8b46a52846d6663c7f4c1a3d9509e18 +Subproject commit d94d8e658d32c24121f184857e193b5f5fbd2e78 diff --git a/var b/var index 6bc517e8..44ddbf77 160000 --- a/var +++ b/var @@ -1 +1 @@ -Subproject commit 6bc517e8659de1d64d09f3a190e97a7e4c4abe5f +Subproject commit 44ddbf77ef50c0a6eb3daa3eea967241fc646df2