diff --git a/pinaxcon/templates/registrasion/report.html b/pinaxcon/templates/registrasion/report.html index 0f899efd..90aa9022 100644 --- a/pinaxcon/templates/registrasion/report.html +++ b/pinaxcon/templates/registrasion/report.html @@ -19,7 +19,11 @@ {% for report in reports %}

{{ report.title }}

+{% if report.headings %} +{% else %} +
+{% endif %} {% for heading in report.headings %} @@ -38,32 +42,25 @@ {% endfor %} -
+ + +
{% endfor %} {% endblock %} {% block extra_script %} - - - - - + + + {% endblock %} diff --git a/pinaxcon/templates/symposion/conference/user_list.html b/pinaxcon/templates/symposion/conference/user_list.html index dc7e068f..45601533 100644 --- a/pinaxcon/templates/symposion/conference/user_list.html +++ b/pinaxcon/templates/symposion/conference/user_list.html @@ -4,47 +4,9 @@ {% block head_title %}User List{% endblock %} -{% block extra_style %} - -{% endblock %} - {% block body_outer %}

User List

- +
@@ -70,26 +32,18 @@ {% endblock %} {% block extra_script %} - - - - + + + {% endblock %} + diff --git a/pinaxcon/templates/symposion/reviews/base.html b/pinaxcon/templates/symposion/reviews/base.html index 8bf2048a..e1358bf8 100644 --- a/pinaxcon/templates/symposion/reviews/base.html +++ b/pinaxcon/templates/symposion/reviews/base.html @@ -3,52 +3,6 @@ {% load i18n %} -{% block extra_style %} -{{ block.super }} - -{% endblock %} - {% block body_class %}reviews{% endblock %} {% block body_outer %} @@ -101,28 +55,18 @@ {% endblock %} - {% block extra_script %} - - - - - + + + {% endblock %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 35d5ce25..9464e11a 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -17,6 +17,7 @@ urlpatterns = [ url(r"^proposals/", include("symposion.proposals.urls")), url(r"^reviews/", include("symposion.reviews.urls")), url(r"^schedule/", include("symposion.schedule.urls")), + url(r"^conference/", include("symposion.conference.urls")), url(r"^teams/", include("symposion.teams.urls")), diff --git a/vendor/registrasion/registrasion/views.py b/vendor/registrasion/registrasion/views.py index dc3c5a6a..b564ee21 100644 --- a/vendor/registrasion/registrasion/views.py +++ b/vendor/registrasion/registrasion/views.py @@ -336,6 +336,10 @@ def _guided_registration_profile_and_voucher(request): profile_section = GuidedRegistrationSection( title="Profile and Personal Information", form=profile_form, + description=("
You can come back and edit these details any time before January 13, " + "2018.
" + "
Known issue: This form breaks with certain emoji ☹. " + "You'll be able to come back and add emoji to free text fields once we fix this.
"), ) return [voucher_section, profile_section]
{% trans "Email" %} {% trans "Name" %}