diff --git a/pinaxcon/templates/_form_snippet.html b/pinaxcon/templates/_form_snippet.html new file mode 100644 index 0000000000000000000000000000000000000000..bc001cc4805d236420eba56ca7d7b704fd451ecb --- /dev/null +++ b/pinaxcon/templates/_form_snippet.html @@ -0,0 +1,27 @@ +{% load lca2017_tags %} + +{% for field in form %} + {% if not field.is_hidden %} +
+ {% classname field.field.widget as widget %} + {% if widget != "CheckboxInput" %} +

+ {{ field.errors }} + {{ field }} + {% else %} + + {{ field }} + {{ field.errors }} + {% endif %} + + {% if field.help_text %} + {% if widget != "CheckboxInput" or not field.errors %} +
+ {% endif %} + {{ field.help_text|safe }} + {% endif %} + +

+
+ {% endif %} +{% endfor %} diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html index 1f300c19d03ca8eeab62a82246414fefda8a1085..dc35a1494028489b2fbd0ab2d122bdfeee3fc5c9 100644 --- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html +++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html @@ -1,15 +1,14 @@ {% load i18n %} -
-
{% trans "Submitted by" %}
-
{{ proposal.speaker }}
+

{% trans "Submitted by" %}

+

{{ proposal.speaker }}

-
{% trans "Target Audience" %}
-
{{ proposal.get_target_audience_display }} 
+

{% trans "Target Audience" %}

+

{{ proposal.get_target_audience_display }} 

{% if proposal.additional_speakers.all %} -
{% trans "Additional Speakers" %}
-
+

{% trans "Additional Speakers" %}

+
+ +

{% endif %} -
{% trans "Abstract" %}
-
{{ proposal.abstract_html|safe }} 
+

{% trans "Abstract" %}

+
{{ proposal.abstract_html|safe }} 
-
{% trans "Private Abstract" %}
-
{{ proposal.private_abstract_html|safe }} 
+

{% trans "Private Abstract" %}

+
{{ proposal.private_abstract_html|safe }} 
-
{% trans "Project" %}
-
{{ proposal.project|safe }} 
+

{% trans "Project" %}

+

{{ proposal.project|safe }} 

-
{% trans "Project URL" %}
-
{{ proposal.project_url|safe }}
+

{% trans "Project URL" %}

+

{{ proposal.project_url|safe }} 

-
{% trans "Video URL" %}
-
{{ proposal.video_url|safe }}
+

{% trans "Video URL" %}

+

{{ proposal.video_url|safe }} 

-
{% trans "Special Requirements" %}
-
{{ proposal.technical_requirements_html|safe }} 
+

{% trans "Special Requirements" %}

+
{{ proposal.technical_requirements_html|safe }}
-
{% trans "Speaker Bio" %}
-
{{ proposal.speaker.biography_html|safe }} 
+

{% trans "Speaker Bio" %}

+
{{ proposal.speaker.biography_html|safe }} 
-
{% trans "Documents" %}
-
+

{% trans "Speaker Experience" %}

+
{{ proposal.speaker.experience_html|safe }} 
+ +

{% trans "Documents" %}

+
{% if proposal.supporting_documents.exists %} {% for document in proposal.supporting_documents.all %} @@ -60,14 +63,12 @@ {% endfor %}
{% else %} - No supporting documents attached to this proposal. +

No supporting documents attached to this proposal.

{% endif %} -
- -
{% trans "Recording Release" %}
-
{{ proposal.recording_release }} 
+ -
{% trans "Materials Release" %}
-
{{ proposal.materials_release }} 
+

{% trans "Recording Release" %}

+

{{ proposal.recording_release }} 

-
+

{% trans "Materials Release" %}

+

{{ proposal.materials_release }} 

diff --git a/pinaxcon/templates/symposion/proposals/base.html b/pinaxcon/templates/symposion/proposals/base.html index cdaeed70e1eca8ed9ea5e1e1e297336445f563ae..43464cada844014a878f822b0af31f188d4f8910 100644 --- a/pinaxcon/templates/symposion/proposals/base.html +++ b/pinaxcon/templates/symposion/proposals/base.html @@ -1,6 +1,16 @@ -{% extends "site_base.html" %} +{% extends "site_base_wagtail.html" %} {% load staticfiles %} +{% block body %} +
+
+

{% block page_title %}{% endblock %}

+ {% block proposals_body %} + {% endblock %} +
+
+{% endblock %} + {% block extra_script %} {% endblock %} diff --git a/pinaxcon/templates/symposion/proposals/document_create.html b/pinaxcon/templates/symposion/proposals/document_create.html index c39fceaa02254d36efb6e1c9465b3d4e11150d44..9598d2201dc4253e93568eca17e39785cd382712 100644 --- a/pinaxcon/templates/symposion/proposals/document_create.html +++ b/pinaxcon/templates/symposion/proposals/document_create.html @@ -4,11 +4,11 @@ {% block page_title %}Upload Document to '{{ proposal.title }}'{% endblock %} -{% block body %} +{% block proposals_body %}
{% csrf_token %}
- {{ form|bootstrap_horizontal }} + {% include "_form_snippet.html" with form=form %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_cancel.html b/pinaxcon/templates/symposion/proposals/proposal_cancel.html index a13f7f79e7d7fa2e5861ea197f22f8ae65674e90..68ee277117326ffb23dcacb05b797604d33aa26a 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_cancel.html +++ b/pinaxcon/templates/symposion/proposals/proposal_cancel.html @@ -3,10 +3,9 @@ {% load i18n %} {% block head_title %}{% trans 'Cancel Proposal' %}{% endblock %} +{% block page_title %}Cancel: {{ proposal.title }}{% endblock %} -{% block body %} -

Cancel: {{ proposal.title }}

- +{% block proposals_body %} {% csrf_token %}

Are you sure you want to cancel {{ proposal.title }}?

diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html index d3f01b19841f4db0f0287a77d779c530f2bf6f1f..745737e8cdda3898e65240a50c669c86d3c5e994 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_detail.html +++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html @@ -6,97 +6,89 @@ {% block head_title %}{{ proposal.title }}{% endblock %} + {% block body %} -
- {% if not proposal.cancelled %} - {% if request.user == proposal.speaker.user %} - - {% trans "Edit this proposal" %} - - - {% trans "Cancel this proposal" %} - - {% else %} - - {% trans "Remove me from this proposal" %} - - {% endif %} - {% else %} - {% trans 'Cancelled' } - {% endif %} -
-

#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})

- -
- -
-
- {% include "symposion/proposals/_proposal_fields.html" %} -
- {% if request.user == proposal.speaker.user %} -
-

{% trans 'Supporting Documents' %}

- - {% if proposal.supporting_documents.exists %} - - {% for document in proposal.supporting_documents.all %} - - - - - {% endfor %} -
{{ document.description }} - - {% csrf_token %} - - -
- {% else %} -

{% trans 'No supporting documents attached to this proposal.' %}

- {% endif %} - {% trans 'Add Document' %} -
- {% endif %} - - {% if message_form %} -
- -

{% trans 'Conversation with Reviewers' %}

- - {% for message in proposal.messages.all %} -
-
{{ message.message|safe }}
-
{% user_display message.user %} {{ message.submitted_at|timesince }} ago
-
-
- {% endfor %} - -

{% trans 'Leave a Message' %}

- -

{% trans 'You can leave a message for the reviewers here.' %}

- -
- {% csrf_token %} -
- {{ message_form|bootstrap }} -
-
- -
-
+
+
+ +

{% block page_title %}#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}){% endblock %}

+ +
+
{% trans "Proposal Details" %}{% trans "Supporting Documents" %}{% trans "Reviewer Feedback" %} ({{ proposal.messages.all|length }}) +
+
+
+ {% include "symposion/proposals/_proposal_fields.html" %} + +
+ {% if not proposal.cancelled %} + {% if request.user == proposal.speaker.user %} + + {% trans "Edit this proposal" %} + + + {% trans "Cancel this proposal" %} + + {% else %} + + {% trans "Remove me from this proposal" %} + + {% endif %} + {% else %} + {% trans 'Cancelled' } + {% endif %} +
+
+ +
+ {% if proposal.supporting_documents.exists %} + + {% for document in proposal.supporting_documents.all %} + + + + + {% endfor %} +
{{ document.description }} +
+ {% csrf_token %} + +
+
+ {% else %} +

{% trans 'No supporting documents attached to this proposal.' %}

+ {% endif %} + {% trans 'Add Document' %}
- {% endif %} +
+ +

{% trans 'Conversation with Reviewers' %}

+ {% for message in proposal.messages.all %} +
+
{{ message.message|safe }}
+
{% user_display message.user %} {{ message.submitted_at|timesince }} ago
+
+
+ {% endfor %} + +

{% trans 'Leave a Message' %}

+ +

{% trans 'You can leave a message for the reviewers here.' %}

+ +
+ {% csrf_token %} +
+ {% include "_form_snippet.html" with form=message_form %} +
+
+ +
+
+
+
-
+ {% endblock %} {% block extra_script %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_edit.html b/pinaxcon/templates/symposion/proposals/proposal_edit.html index 219d107daa99d2450445f68f5d5ee7d73c0827d1..1d4f894f3ae07fd1d37d527496545380cf70a9bf 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_edit.html +++ b/pinaxcon/templates/symposion/proposals/proposal_edit.html @@ -3,20 +3,19 @@ {% load bootstrap %} {% block head_title %}Editing {{ proposal.title }}{% endblock %} +{% block page_title %}Edit: {{ proposal.title }}{% endblock %} -{% block body %} -

Edit: {{ proposal.title }}

+{% block proposals_body %} +

Manage speakers

-

Manage speakers

- -
- {% csrf_token %} -
- {{ form|bootstrap }} -
-
- - Cancel -
-
+
+ {% csrf_token %} +
+ {% include "_form_snippet.html" with form=form %} +
+
+ + Cancel +
+
{% endblock %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html index 0127b413ae84b0757ba64f5b4468f355f1b93620..9ae5b1cfa8403a1105a70729728c1f3fab7badbe 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html +++ b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html @@ -3,15 +3,17 @@ {% load i18n %} {% load bootstrap %} -{% block body %} -

{% trans 'Proposal:' %} {{ proposal.title }}

+{% block page_title %}{% trans 'Proposal:' %} {{ proposal.title }}{% endblock %} + +{% block proposals_body %} +

{% trans 'Edit proposal' %}

-

{% trans 'Current Speakers' %}

+

{% trans 'Current Speakers' %}

{% for speaker in speakers %} {% if speaker.user %} @@ -21,11 +23,11 @@ {% endif %} {% endfor %} -

{% trans 'Add another speaker' %}

+

{% trans 'Add another speaker' %}

{% csrf_token %} - {{ add_speaker_form|bootstrap }} + {% include "_form_snippet.html" with form=add_speaker_form %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit.html b/pinaxcon/templates/symposion/proposals/proposal_submit.html index a2face3756fd62794a677a45acc16c39c16379fd..0a8294a2a5b8360bac745816ed656e0599e5354e 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_submit.html +++ b/pinaxcon/templates/symposion/proposals/proposal_submit.html @@ -5,8 +5,7 @@ {% block page_title %}{% trans "Submit A Proposal" %}{% endblock %} -{% block body %} - {% box "proposal_submit" %} +{% block proposals_body %} {% if kinds %}

Select what kind of proposal you'd like to submit:

diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html index c90de0d61f265b001e54ee6b7448fdb54b5e4e85..ddef907e70efde30fef795910743e59c302e033c 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html +++ b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html @@ -1,26 +1,22 @@ {% extends "symposion/proposals/base.html" %} -{% load bootstrap %} -{% load pinax_boxes_tags %} {% load i18n %} {% block page_title %}Submit a Proposal for a {{ kind.name }}{% endblock %} -{% block body %} - {% box "example_proposal" %} - - +{% block proposals_body %} + {% csrf_token %}
- {{ proposal_form|bootstrap_horizontal }} + {% include "_form_snippet.html" with form=proposal_form %}
-

- You will be able to edit your proposal after it has been submitted. The program committee may ask questions, provide feedback, and even suggest changes to your proposal as part of the review processes. -

- - - +

+ You will be able to edit your proposal after it has been submitted. The program committee may ask questions, provide feedback, and even suggest changes to your proposal as part of the review processes. +

+ + +
{% endblock %} diff --git a/pinaxcon/templates/symposion/speakers/base.html b/pinaxcon/templates/symposion/speakers/base.html index 5c4b85b5dfb9c1f73f52e79dadd4fa16286761b2..3327d0a4014b7b13b5ad436fabec454fcb1192bd 100644 --- a/pinaxcon/templates/symposion/speakers/base.html +++ b/pinaxcon/templates/symposion/speakers/base.html @@ -1 +1 @@ -{% extends "site_base_onecolumn.html" %} +{% extends "site_base_wagtail.html" %} diff --git a/pinaxcon/templates/symposion/speakers/speaker_create.html b/pinaxcon/templates/symposion/speakers/speaker_create.html index 7475f834b7c2001e598b74ebfa68192fd6b5d0a6..c51b86d98ef99ef73de9c42eabbfca0d0c667797 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_create.html +++ b/pinaxcon/templates/symposion/speakers/speaker_create.html @@ -7,17 +7,19 @@ {% block page_title %}{% trans "Create Speaker Profile" %}{% endblock %} {% block body %} - {% box "speaker-profile" %} - +
+
{% csrf_token %} - {% trans "Create Speaker Profile" %} +

{% trans "Create Speaker Profile" %}

- {{ speaker_form|bootstrap }} + {% include "_form_snippet.html" with form=speaker_form %}
Cancel
+
+
{% endblock %} diff --git a/pinaxcon/templates/symposion/speakers/speaker_edit.html b/pinaxcon/templates/symposion/speakers/speaker_edit.html index 6fc590f6537c6eddad7ab404d4b5f031a74fb3b4..d63ded20598110843ba9138aacbed87a92f4b1ad 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_edit.html +++ b/pinaxcon/templates/symposion/speakers/speaker_edit.html @@ -7,17 +7,19 @@ {% block page_title %}{% trans "Edit Speaker Profile" %}{% endblock %} {% block body %} - {% box "speaker-profile" %} - +
+
{% csrf_token %} - {% trans "Edit Speaker Profile" %} +

{% trans "Edit Speaker Profile" %}

- {{ speaker_form|bootstrap }} + {% include "_form_snippet.html" with form=speaker_form %}
Cancel
+
+
{% endblock %} diff --git a/pinaxcon/templatetags/__init__.py b/pinaxcon/templatetags/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pinaxcon/templatetags/lca2017_tags.py b/pinaxcon/templatetags/lca2017_tags.py new file mode 100644 index 0000000000000000000000000000000000000000..9c10b4962df2cd28cc6913d63071677300c024ef --- /dev/null +++ b/pinaxcon/templatetags/lca2017_tags.py @@ -0,0 +1,6 @@ +from django import template +register = template.Library() + +@register.assignment_tag() +def classname(ob): + return ob.__class__.__name__