-
- {% include "symposion/proposals/_proposal_fields.html" %}
-
- {% if request.user == proposal.speaker.user %}
-
-
{% trans 'Supporting Documents' %}
-
- {% if proposal.supporting_documents.exists %}
-
- {% 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 %}
-
-
-
{% user_display message.user %} {{ message.submitted_at|timesince }} ago
-
-
- {% endfor %}
-
-
{% trans 'Leave a Message' %}
-
-
{% trans 'You can leave a message for the reviewers here.' %}
-
-
+
+
+
+
{% block page_title %}#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}){% endblock %}
+
+
+
+ {% include "symposion/proposals/_proposal_fields.html" %}
+
+
+
+
+
+ {% if proposal.supporting_documents.exists %}
+
+ {% else %}
+
{% trans 'No supporting documents attached to this proposal.' %}
+ {% endif %}
+
{% trans 'Add Document' %}
- {% endif %}
+
+
+
{% trans 'Conversation with Reviewers' %}
+ {% for message in proposal.messages.all %}
+
+
+
{% user_display message.user %} {{ message.submitted_at|timesince }} ago
+
+
+ {% endfor %}
+
+
{% trans 'Leave a Message' %}
+
+
{% trans 'You can leave a message for the reviewers here.' %}
+
+
+
+
-
+
{% 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
-
-
+
{% 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' %}
{% 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" %}
-
+
{% 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" %}
-
+
{% 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__