Updates proposal forms and review template (#14)

* Updates the forms and models for Proposal Bases

* Proposal review templates only display fields relevant to LCA

* Display total votes properly

pinaxcon/proposals/forms.py

@@ -20,9 +20,13 @@ class TalkProposalForm(ProposalForm):
         model = TalkProposal
         fields = [
             "title",
-            "audience_level",
+            "target_audience",
-            "description",
             "abstract",
-            "additional_notes",
+            "private_abstract",
+            "technical_requirements",
+            "project",
+            "project_url",
+            "video_url",
             "recording_release",
+            "materials_release",
         ]

pinaxcon/proposals/models.py

@@ -5,21 +5,35 @@ from symposion.proposals.models import ProposalBase
 
 class Proposal(ProposalBase):
 
-    AUDIENCE_LEVEL_NOVICE = 1
+    TARGET_USER = 1
-    AUDIENCE_LEVEL_EXPERIENCED = 2
+    TARGET_BUSINESS = 2
-    AUDIENCE_LEVEL_INTERMEDIATE = 3
+    TARGET_COMMUNITY = 3
+    TARGET_DEVELOPER = 4
 
-    AUDIENCE_LEVELS = [
+    TARGET_AUIDENCES = [
-        (AUDIENCE_LEVEL_NOVICE, "Novice"),
+        (TARGET_USER, "User"),
-        (AUDIENCE_LEVEL_INTERMEDIATE, "Intermediate"),
+        (TARGET_BUSINESS, "Business"),
-        (AUDIENCE_LEVEL_EXPERIENCED, "Experienced"),
+        (TARGET_COMMUNITY, "Community"),
+        (TARGET_DEVELOPER, "Developer"),
     ]
 
-    audience_level = models.IntegerField(choices=AUDIENCE_LEVELS)
+    target_audience = models.IntegerField(choices=TARGET_AUIDENCES)
 
     recording_release = models.BooleanField(
         default=True,
-        help_text="By submitting your proposal, you agree to give permission to the conference organizers to record, edit, and release audio and/or video of your presentation. If you do not agree to this, please uncheck this box."
+        help_text="I allow Linux Australia to release any recordings of "
+        "presentations covered by this proposal, under the <a "
+        "href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> "
+        "Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"
+    )
+
+    materials_release = models.BooleanField(
+        default=True,
+        help_text="I allow Linux Australia to release any other material "
+        "(such as slides) from presentations covered by this proposal, under "
+        "the <a "
+        "href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> "
+        "Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"
     )
 
     class Meta:

pinaxcon/templates/symposion/proposals/_proposal_fields.html

@@ -4,11 +4,8 @@
     <dt>{% trans "Submitted by" %}</dt>
     <dd>{{ proposal.speaker }}</dd>
 
-    <dt>{% trans "Track" %}</dt>
+    <dt>{% trans "Target Audience" %}</dt>
-    <dd>{{ proposal.track }}&nbsp;</dd>
+    <dd>{{ proposal.get_target_audience_display }}&nbsp;</dd>
-
-    <dt>{% trans "Audience Level" %}</dt>
-    <dd>{{ proposal.get_audience_level_display }}&nbsp;</dd>
 
     {% if proposal.additional_speakers.all %}
         <dt>{% trans "Additional Speakers" %}</dt>
@@ -25,17 +22,26 @@
         </dd>
     {% endif %}
 
-    <dt>{% trans "Description" %}</dt>
-    <dd>{{ proposal.description }}&nbsp;</dd>
-
     <dt>{% trans "Abstract" %}</dt>
     <dd>{{ proposal.abstract_html|safe }}&nbsp;</dd>
 
-    <dt>{% trans "Notes" %}</dt>
+    <dt>{% trans "Private Abstract" %}</dt>
-    <dd>{{ proposal.additional_notes_html|safe }}&nbsp;</dd>
+    <dd>{{ proposal.private_abstract_html|safe }}&nbsp;</dd>
+
+    <dt>{% trans "Project" %}</dt>
+    <dd>{{ proposal.project|safe }}&nbsp;</dd>
+
+    <dt>{% trans "Project URL" %}</dt>
+    <dd><a href="{{ proposal.project_url|safe }}">{{ proposal.project_url|safe }}</a></dd>
+
+    <dt>{% trans "Video URL" %}</dt>
+    <dd><a href="{{ proposal.video_url|safe }}">{{ proposal.video_url|safe }}</a></dd>
+
+    <dt>{% trans "Special Requirements" %}</dt>
+    <dd>{{ proposal.technical_requirements_html|safe }}&nbsp;</dd>
 
     <dt>{% trans "Speaker Bio" %}</dt>
-    <dd>{{ proposal.speaker.biography|safe }}&nbsp;</dd>
+    <dd>{{ proposal.speaker.biography_html|safe }}&nbsp;</dd>
 
     <dt>{% trans "Documents" %}</dt>
     <dd>
@@ -57,4 +63,11 @@
             No supporting documents attached to this proposal.
         {% endif %}
     </dd>
+
+    <dt>{% trans "Recording Release" %}</dt>
+    <dd>{{ proposal.recording_release }}&nbsp;</dd>
+
+    <dt>{% trans "Materials Release" %}</dt>
+    <dd>{{ proposal.materials_release }}&nbsp;</dd>
+
 </dl>

pinaxcon/templates/symposion/proposals/proposal_detail.html

@@ -26,7 +26,7 @@
         {% endif %}
     </div>
 
-    <h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}, Track: {{ proposal.track }})</h3>
+    <h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})</h3>
 
     <div class="tabbable">
         <ul class="nav nav-tabs">

pinaxcon/templates/symposion/reviews/_review_table.html

@@ -4,8 +4,7 @@
     <thead>
         <th>#</th>
         <th>{% trans "Speaker / Title" %}</th>
-        <th>{% trans "Category" %}</th>
+        <th>{% trans "Votes" %}</th>
-        <th><i class="fa fa-comment-alt"></i></th>
         <th>{% trans "Score" %}</th>
         <th>{% trans "+2" %}</th>
         <th>{% trans "+1" %}</th>
@@ -25,8 +24,7 @@
                         {{ proposal.title }}
                     </a>
                 </td>
-                <td>{{ proposal.track }}</td>
+                <td>{{ proposal.total_votes }}</td>
-                <td>{{ proposal.comment_count }}</td>
                 <td>{{ proposal.score }}</td>
                 <td>{{ proposal.plus_two }}</td>
                 <td>{{ proposal.plus_one }}</td>