diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
index 09113673cc9c0f0a81bf6103a62a6b4d15fb3277..86940b0b5fa3e0835c7c89f7794ff24137dd2838 100644
--- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html
+++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
@@ -1,116 +1,194 @@
{% load i18n %}
{% load pyconau2017_tags %}
-
{% trans "Submitted by" %}
- {{ proposal.speaker }} <{{ proposal.speaker.email }}>
+
+
+
+
{{ proposal.speaker }} <{{ proposal.speaker.email }}>
+
+
- {% trans "Proposal Type" %}
- {{ proposal.kind.name|capfirst }}
+
+
+
+
{{ proposal.kind.name|capfirst }}
+
+
- {% trans "Target Audience" %}
- {{ proposal.get_target_audience_display }}
+
+
+
+
{{ proposal.get_target_audience_display }}
+
+
{% if proposal.additional_speakers.all %}
- {% trans "Additional Speakers" %}
-
- {% for speaker in proposal.additional_speakers.all %}
- -
- {% if speaker.user %}
- {{ speaker.name }} <{{ speaker.email }}>
- {% else %}
- {{ speaker.email }} ({% trans "Invitation Sent" %})
- {% endif %}
-
- {% endfor %}
-
-
+
+
+
+
+
+
+ Name |
+ Email |
+ Status |
+
+
+
+ {% for speaker in proposal.additional_speakers.all %}
+
+ {% if speaker.user %}
+ {{ speaker.name }} |
+ {{ speaker.email }} |
+ Joined |
+ {% else %}
+ Unknown |
+ {{ speaker.email }} |
+ Invitation Sent |
+ {% endif %}
+
+ {% endfor %}
+
+
+
+
+
{% endif %}
- {% trans "Abstract" %}
- {{ proposal.abstract_html|safe }}
+
+
+
+
{{ proposal.abstract_html|safe }}
+
+
+
- {% trans "Private Abstract" %}
- {{ proposal.private_abstract_html|safe }}
+
+
+
+
{{ proposal.private_abstract_html|safe }}
+
+
+
- {% trans "Project" %}
- {{ proposal.project|safe }}
+
+
+
+ {% if proposal.project %}
+
{{ proposal.project|safe }}
+ {% else %}
+
None Provided
+ {% endif %}
+
+
- {% trans "Project URL" %}
- {{ proposal.project_url|safe }}
+
- {% trans "Video URL" %}
- {{ proposal.video_url|safe }}
+
- {% trans "Special Requirements" %}
- {{ proposal.technical_requirements_html|safe }}
+
+
+
+ {% if proposal.technical_requirements_html %}
+
{{ proposal.technical_requirements_html|safe }}
+ {% else %}
+
No Special Talk Requirements Requested
+ {% endif %}
+
+
+
+
{% for speaker in proposal.speakers %}
- {% trans "Speaker:" %} {{ speaker.name }}
- {% trans "Biography" %}
-
- {{ speaker.biography_html|safe }}
-
- {% trans "Experience" %}
- {{ speaker.experience_html|safe }}
+ {% if speaker.name %}
+
+
+
Speaker: {{ speaker.name }}
+
+
+
+
+
{{ speaker.biography_html|safe }}
+
+
+
+
{{ speaker.experience_html|safe }}
+
+ {% if speaker.accessibility_html %}
+
+
+
{{ speaker.accessibility_html|safe }}
+
+ {% endif %}
+
+
+ {% endif %}
{% endfor %}
{% can_manage proposal as can_manage_proposal %}
{% if can_manage_proposal or request.user.speaker_profile in proposal.speakers %}
-
- {% trans "Assistance required?" %}
+
+
+
+
+
+
+ Name |
+ Travel |
+ Accomodation |
+
+
+
+ {% for speaker in proposal.speakers %}
+
+ {% if speaker.user %}
+ {{ speaker.name }} |
+ {{ speaker.travel_assistance }} |
+ {{ speaker.accommodation_assistance }} |
+ {% else %}
+ Unconfirmed co-presenter |
+ Unknown |
+ Unknown |
+ {% endif %}
+
+ {% endfor %}
+
+
+
+
-
-
- |
- {% trans "Travel" %} |
- {% trans "Accommodation" %} |
-
- {% for speaker in proposal.speakers %}
-
- {{ speaker.name }} |
- {{ speaker.travel_assistance }} |
- {{ speaker.accommodation_assistance }} |
-
- {% endfor %}
-
-
-
- {% if proposal.speaker.accessibility_html %}
- {% trans "Speaker Accessibility Requirements" %}
- {% for speaker in proposal.speakers %}
- {% if speaker.accessibility_html %}
- {{ speaker.name }}
- {{ speaker.accessibility_html|safe }}
- {% endif %}
- {% endfor %}
- {% endif %}
-
{% endif %}
-
- {% trans "Documents" %}
- {% if proposal.supporting_documents.exists %}
-
- {% else %}
-
No supporting documents attached to this proposal.
- {% endif %}
+
+
+
{{ proposal.recording_release }}
+
+
- {% trans "Recording Release" %}
- {{ proposal.recording_release }}
-
- {% trans "Materials Release" %}
- {{ proposal.materials_release }}
+
+
+
+
{{ proposal.materials_release }}
+
+
+