diff --git a/pinaxcon/templates/_form_btns.html b/pinaxcon/templates/_form_btns.html index a38a9ce7..00a0ca25 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 46449e50..78ba6ac5 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 %} -
- -
- {% if proposal.cancelled %} -

WITHDRAWN

- {% else %} -

Not withdrawn

- {% endif %} -
-
+
+

+ Details +

+
-
- -
-

{{ proposal.speaker }} <{{ proposal.speaker.email }}>

-
-
- -
- -
-

{{ proposal.kind.name|capfirst }}

-
-
- -
- -
-

{{ proposal.get_target_audience_display }} 

-
-
- - {% if proposal.talk_format %} -
- -
-

{{ proposal.get_talk_format_display }}

-
-
+
+ +
+ {% if proposal.cancelled %} +

WITHDRAWN

+ {% else %} +

Not withdrawn

{% endif %} +
+
- {% if proposal.can_exhibit %} -
- -
-

{{ proposal.get_can_exhibit_display }}

-
-
- -
- {% if proposal.exhibition_requirements %} -
{{ proposal.exhibition_requirements|safe }}
- {% else %} -
No Special Talk Requirements Requested
- {% endif %} - -
-   -
+
+ +
+

{{ proposal.speaker }} <{{ proposal.speaker.email }}>

+
+
-
- {% endif %} +
+ +
+

{{ proposal.kind.name|capfirst }}

+
+
- {% if proposal.additional_speakers.all %} -
- -
- - - - - - - - - - {% for speaker in proposal.additional_speakers.all %} - - {% if speaker.user %} - - - - {% else %} - - - - {% endif %} - - {% endfor %} - -
NameEmailStatus
{{ speaker.name }}{{ speaker.email }}JoinedUnknown{{ speaker.email }}Invitation Sent
-
-
-

- {% endif %} +
+ +
+

{{ proposal.get_target_audience_display }} 

+
+
-
- -
-
{{ proposal.abstract_html|safe }} 
-

-
-
+{% if proposal.talk_format %} +
+ +
+

{{ proposal.get_talk_format_display }}

+
+
+{% endif %} -
- -
-
{{ proposal.private_abstract_html|safe }} 
-

-
-
- -
- -
- {% if proposal.project %} -

{{ proposal.project|safe }} 

- {% else %} -

None Provided

- {% endif %} -
-
- -
- -
- {% if proposal.project_url %} -

{{ proposal.project_url|safe }} 

- {% else %} -

None Provided

- {% endif %} -
-
- -
- -
- {% if proposal.video_url %} -

{{ proposal.video_url|safe }} 

- {% else %} -

None Provided

- {% endif %} -
-
- -
- -
- {% if proposal.technical_requirements_html %} -
{{ proposal.technical_requirements_html|safe }}
- {% else %} -
No Special Talk Requirements Requested
- {% endif %} -
-   -
-
- - {% for speaker in proposal.speakers %} - {% if speaker.name %} -
-
-

Speaker: {{ speaker.name }}

-
-
-
- -
{{ speaker.biography_html|safe }} 
-
-
- -
{{ speaker.experience_html|safe }} 
-
- {% if speaker.accessibility_html %} -
- -
{{ speaker.accessibility_html|safe }} 
-
- {% endif %} -
-
+{% if proposal.can_exhibit %} +
+ +
+

{{ proposal.get_can_exhibit_display }}

+
+
+ +
+ {% if proposal.exhibition_requirements %} +
{{ proposal.exhibition_requirements|safe }}
+ {% else %} +
No Special Talk Requirements Requested
{% endif %} - {% endfor %} + +
+   +
+
+{% endif %} - {% can_manage proposal as can_manage_proposal %} - {% if can_manage_proposal or request.user.speaker_profile in proposal.speakers %} -
- -
- - - - - - - - - - {% for speaker in proposal.speakers %} - - {% if speaker.user %} - - - - {% else %} - - - - {% endif %} - - {% endfor %} - -
NameTravelAccomodation
{{ speaker.name }}{{ speaker.travel_assistance }}{{ speaker.accommodation_assistance }}Unconfirmed co-presenterUnknownUnknown
-
-
-
+{% if proposal.additional_speakers.all %} +
+ +
+ + + + + + + + + + {% for speaker in proposal.additional_speakers.all %} + + {% if speaker.user %} + + + + {% else %} + + + + {% endif %} + + {% endfor %} + +
NameEmailStatus
{{ speaker.name }}{{ speaker.email }}JoinedUnknown{{ speaker.email }}Invitation Sent
+
+
+{% endif %} + +
+ +
+
{{ proposal.abstract_html|safe }} 
+

+
+
+ +
+ +
+
{{ proposal.private_abstract_html|safe }} 
+

+
+
+ +
+ +
+ {% if proposal.project %} +

{{ proposal.project|safe }} 

+ {% else %} +

None Provided

{% endif %} +
+
-
- -
-

{{ proposal.recording_release }} 

-
-   -
+
+ +
+ {% if proposal.project_url %} +

{{ proposal.project_url|safe }} 

+ {% else %} +

None Provided

+ {% endif %} +
+
-
- -
-

{{ proposal.materials_release }} 

-
-   +
+ +
+ {% if proposal.video_url %} +

{{ proposal.video_url|safe }} 

+ {% else %} +

None Provided

+ {% endif %} +
+
+ +
+ +
+ {% if proposal.technical_requirements_html %} +
{{ proposal.technical_requirements_html|safe }}
+ {% else %} +
No Special Talk Requirements Requested
+ {% endif %} +
+
+ +
+ +
+

{{ proposal.recording_release }} 

+
+
+ +
+ +
+

{{ proposal.materials_release }} 

+
+
+ +
+

+ Speakers +

+
+ +{% for speaker in proposal.speakers %} +{% if speaker.name %} +
+
+

{{ 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 %} + +
+

+ Travel Assistance +

+
+ + +
+
+ + + + + + + + + + {% for speaker in proposal.speakers %} + + {% if speaker.user %} + + + + {% else %} + + + + {% endif %} + + {% endfor %} + +
NameTravelAccomodation
{{ speaker.name }}{{ speaker.travel_assistance }}{{ speaker.accommodation_assistance }}Unconfirmed co-presenterUnknownUnknown
+
+
+
+{% endif %} diff --git a/pinaxcon/templates/symposion/proposals/_proposal_row.html b/pinaxcon/templates/symposion/proposals/_proposal_row.html index bea1451d..0cd8c4ac 100644 --- a/pinaxcon/templates/symposion/proposals/_proposal_row.html +++ b/pinaxcon/templates/symposion/proposals/_proposal_row.html @@ -1,13 +1,12 @@ - -
+
+ {% endif %}

{{ proposal.title }} diff --git a/pinaxcon/templates/symposion/proposals/base.html b/pinaxcon/templates/symposion/proposals/base.html index 43cef910..999a0e9d 100644 --- a/pinaxcon/templates/symposion/proposals/base.html +++ b/pinaxcon/templates/symposion/proposals/base.html @@ -2,15 +2,8 @@ {% load staticfiles %} -{% block utility_body_outer %} -{% block proposals_body_outer %} -
-
- {% block utility_body %} - {% block proposals_body %} - {% endblock %} - {% endblock %} -
-
-{% endblock %} +{% block utility_body %} + {% block proposals_body %} + {% endblock %} {% endblock %} + diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html index 0d8c85fd..1768d0d1 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_detail.html +++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html @@ -5,18 +5,17 @@ {% block head_title %}{{ proposal.title }}{% endblock %} {% block page_title %}#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}){% endblock %} -{% block proposals_body_outer %} -
-