diff --git a/pinaxcon/templates/pyconau2017/_right_floating_image.html b/pinaxcon/templates/pyconau2017/_right_floating_image.html deleted file mode 100644 index 3177b39f..00000000 --- a/pinaxcon/templates/pyconau2017/_right_floating_image.html +++ /dev/null @@ -1,5 +0,0 @@ -
-
-
-
-
diff --git a/pinaxcon/templates/pyconau2017/content_page.html b/pinaxcon/templates/pyconau2017/content_page.html deleted file mode 100644 index ef39c2e7..00000000 --- a/pinaxcon/templates/pyconau2017/content_page.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "site_base_wagtail.html" %} -{% load staticfiles %} - -{% load pyconau2017_tags %} - - -{% load i18n %} - -{% block body_class %}template-content-page{% endblock %} - -{% block head_title %}{% endblock %} - -{% comment %} -{% block body_base %} -{% block body %} - - {% block heading_panel %} - - {% block topbar_base %} - {% endblock %} - {% endblock %} - - {% block content_base %} - -{% endcomment %} - -{% block content_base %} -{% block content %} -{% endblock %} -{% endblock %} - -{% comment %} -the name "extra_script" doesn't actually match the inherited name... -{% block extra_script %} - -{% endblock %} -{% endcomment %} - diff --git a/pinaxcon/templates/symposion/schedule/presentation_detail.html b/pinaxcon/templates/symposion/schedule/presentation_detail.html index a31674a7..b63f35f4 100644 --- a/pinaxcon/templates/symposion/schedule/presentation_detail.html +++ b/pinaxcon/templates/symposion/schedule/presentation_detail.html @@ -46,7 +46,7 @@

Presented by

{% for speaker in presentation.speakers %} {% speaker_photo speaker 512 as speaker_photo_url %} - {% include "pyconau2017/_right_floating_image.html" with image_url=speaker_photo_url %} + {% include "lca2017/_right_floating_image.html" with image_url=speaker_photo_url %}

{{ speaker }}

diff --git a/pinaxcon/templates/symposion/schedule/public_base.html b/pinaxcon/templates/symposion/schedule/public_base.html index 6b6bea91..520b4a86 100644 --- a/pinaxcon/templates/symposion/schedule/public_base.html +++ b/pinaxcon/templates/symposion/schedule/public_base.html @@ -1,7 +1,7 @@ -{% extends "pyconau2017/content_page.html" %} +{% extends "lca2017/content_page.html" %} {% load staticfiles %} {% comment %} {% block header_background_image %}{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}{% endblock %} -{% endcomment %} \ No newline at end of file +{% endcomment %} diff --git a/pinaxcon/templates/utility_page.html b/pinaxcon/templates/utility_page.html index 1c183a36..7efddd12 100644 --- a/pinaxcon/templates/utility_page.html +++ b/pinaxcon/templates/utility_page.html @@ -1,4 +1,4 @@ -{% extends "pyconau2017/content_page.html" %} +{% extends "lca2017/content_page.html" %} {% load staticfiles %} {% comment %}