Add notes field to proposal details (reviews/proposals). Fixes #82.

pyconde/proposals/templates/proposals/proposal_detail.html

@@ -33,6 +33,12 @@ <h2>{% trans "Description" %}</h2>
     {{ proposal.description|markdown:"safe" }}
 </div>
 
+{% if proposal.notes %}
+<div class="notes">
+    <h2>{% trans "Notes" %}</h2>
+    {{ proposal.notes|markdown:"safe" }}
+</div>
+{% endif %}
 
 <div class="actions">
     {% if proposal.kind.accepts_proposals %}

pyconde/reviews/forms.py

@@ -73,6 +73,7 @@ def init_from_proposal(cls, proposal):
             'duration': proposal.duration,
             'audience_level': proposal.audience_level,
             'available_timeslots': proposal.available_timeslots.all(),
+            'notes': proposal.notes,
         }, kind_instance=proposal.kind)
         return form
 
@@ -86,14 +87,15 @@ def __init__(self, *args, **kwargs):
         del self.fields['track']
 
 
-class UpdateTutorialProposalForm(UpdateProposalForm):
+class UpdateTrainingProposalForm(UpdateProposalForm):
     class Meta(object):
         model = models.ProposalVersion
-        fields = ['title', 'abstract', 'description', 'audience_level', 'tags']
+        fields = ['title', 'abstract', 'description', 'audience_level',
+                  'tags', 'notes']
 
     def __init__(self, *args, **kwargs):
-        super(UpdateTutorialProposalForm, self).__init__(*args, **kwargs)
-        proposal_forms.TutorialSubmissionForm().customize_fields(form=self)
+        super(UpdateTrainingProposalForm, self).__init__(*args, **kwargs)
+        proposal_forms.TrainingSubmissionForm().customize_fields(form=self)
         self.helper.layout = Layout(
             Fieldset(_('General'),
                 Field('title', autofocus='autofocus'),
@@ -103,12 +105,13 @@ def __init__(self, *args, **kwargs):
             Fieldset(_('Details'),
                 Field('audience_level'),
                 Field('tags'),
+                Field('notes'),
                 ),
             ButtonHolder(Submit('save', _("Save"), css_class="btn-primary"))
             )
 
     def customize_save(self, instance):
-        instance.duration = conference_models.SessionDuration.current_objects.get(slug='tutorial')
+        instance.duration = conference_models.SessionDuration.current_objects.get(slug='training')
 
 
 class CommentForm(forms.ModelForm):

pyconde/reviews/settings.py

@@ -6,7 +6,7 @@
 
 PROPOSAL_UPDATE_FORMS = getattr(settings, 'REVIEWS_PROPOSAL_UPDATE_FORMS', {
     'talk': 'pyconde.reviews.forms.UpdateTalkProposalForm',
-    'tutorial': 'pyconde.reviews.forms.UpdateTutorialProposalForm',
+    'training': 'pyconde.reviews.forms.UpdateTrainingProposalForm',
     })
 
 RATING_MAPPING = getattr(settings, 'REVIEW_RATING_MAPPING', {

pyconde/reviews/templates/reviews/proposal_details.html

@@ -22,6 +22,17 @@ <h3>{% trans "Description" %}</h3>
             {{ proposal.description|markdown:"safe" }}
         {% endif %}
     </div>
+
+    {% if proposal_version and proposal_version.notes or proposal.notes %}
+        <h3>{% trans "Notes" %}</h3>
+        <div class="notes">
+            {% if proposal_version %}
+                {{ proposal_version.notes|markdown:"safe" }}
+            {% else %}
+                {{ proposal.notes|markdown:"safe" }}
+            {% endif %}
+        </div>
+    {% endif %}
     </article>
     <div class="actions">
         {% if can_update %}

pyconde/reviews/templates/reviews/proposalversion_detail.html

@@ -14,9 +14,16 @@ <h3>{% trans "Description" %}</h3>
     <div class="description">
         {{ version.description|markdown:"safe" }}
     </div>
+
+    {% if version.notes %}
+        <h3>{% trans "Notes" %}</h3>
+        <div class="notes">
+            {{ version.notes|markdown:"safe" }}
+        </div>
+    {% endif %}
     </article>
 {% endblock %}
 {% block sidebar %}
     {{ block.super }}
     {% include "reviews/partials/versions_box.html" %}
-{% endblock %}
+{% endblock %}