diff --git a/pinaxcon/templates/_form_btns.html b/pinaxcon/templates/_form_btns.html index a38a9ce7ec652c85342a6c07e1472a6acc38342a..00a0ca25c8344719de7dfe9a111da1bf978e13d7 100644 --- a/pinaxcon/templates/_form_btns.html +++ b/pinaxcon/templates/_form_btns.html @@ -1,2 +1,2 @@ - Cancel \ No newline at end of file +Cancel \ No newline at end of file diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html index 46449e50b396e6b5634cc90db79d92f0028e04fc..78ba6ac5852d4e368bbddac846b9c24ecdaecebd 100644 --- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html +++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html @@ -1,236 +1,249 @@ {% load i18n %} {% load lca2018_tags %} -
WITHDRAWN
- {% else %} -Not withdrawn
- {% endif %} -{{ proposal.speaker }} <{{ proposal.speaker.email }}>
-{{ proposal.kind.name|capfirst }}
-{{ proposal.get_target_audience_display }}
-{{ proposal.get_talk_format_display }}
-WITHDRAWN
+ {% else %} +Not withdrawn
{% endif %} - - {% if proposal.can_exhibit %} -{{ proposal.get_can_exhibit_display }}
-{{ proposal.speaker }} <{{ proposal.speaker.email }}>
+{{ proposal.kind.name|capfirst }}
+{{ proposal.get_target_audience_display }}
+{{ proposal.get_talk_format_display }}
+{{ proposal.get_can_exhibit_display }}
+Name | +Status | +||||
---|---|---|---|---|---|
{{ speaker.name }} | +{{ speaker.email }} | +Joined | + {% else %} +Unknown | +{{ speaker.email }} | +Invitation Sent | + {% endif %} +
{{ proposal.project|safe }}
+ {% else %} +None Provided
{% endif %} - - {% if proposal.additional_speakers.all %} -Name | -Status | -||||
---|---|---|---|---|---|
{{ speaker.name }} | -{{ speaker.email }} | -Joined | - {% else %} -Unknown | -{{ speaker.email }} | -Invitation Sent | - {% endif %} -
{{ proposal.project_url|safe }}
+ {% else %} +None Provided
{% endif %} - -{{ proposal.project|safe }}
- {% else %} -None Provided
- {% endif %} -None Provided
+ {% endif %} +{{ proposal.recording_release }}
+{{ proposal.materials_release }}
+{{ proposal.project_url|safe }}
- {% else %} -None Provided
- {% endif %} -None Provided
- {% endif %} -Name | -Travel | -Accomodation | -|||
---|---|---|---|---|---|
{{ speaker.name }} | -{{ speaker.travel_assistance }} | -{{ speaker.accommodation_assistance }} | - {% else %} -Unconfirmed co-presenter | -Unknown | -Unknown | - {% endif %} -
{{ proposal.recording_release }}
-{{ proposal.materials_release }}
-Name | +Travel | +Accomodation | +|||
---|---|---|---|---|---|
{{ speaker.name }} | +{{ speaker.travel_assistance }} | +{{ speaker.accommodation_assistance }} | + {% else %} +Unconfirmed co-presenter | +Unknown | +Unknown | + {% endif %} +