diff --git a/pinaxcon/templates/symposion/schedule/presentation_detail.html b/pinaxcon/templates/symposion/schedule/presentation_detail.html index 6cd14ff38153b72f182723a818f6d1cca411352a..8234f79cb47a6acec812eb28f329b4e9b74d304e 100644 --- a/pinaxcon/templates/symposion/schedule/presentation_detail.html +++ b/pinaxcon/templates/symposion/schedule/presentation_detail.html @@ -26,7 +26,7 @@ {% for speaker in presentation.speakers %}
  • {% speaker_photo speaker 120 as speaker_photo_url %} - + {{ speaker }}

    {{ speaker }}
    {% if speaker.twitter_username %} diff --git a/pinaxcon/templates/symposion/speakers/base.html b/pinaxcon/templates/symposion/speakers/base.html index eaf4e530d758ea5b6f4ce98b0ef29b5071f79d62..c80151524cf64c243721500247b7dd6ce50cf5e9 100644 --- a/pinaxcon/templates/symposion/speakers/base.html +++ b/pinaxcon/templates/symposion/speakers/base.html @@ -1,6 +1 @@ -{% extends "utility_page.html" %} - -{% block utility_body %} - {% block proposals_body %} - {% endblock %} -{% endblock %} +{% extends "site_base.html" %} diff --git a/pinaxcon/templates/symposion/speakers/speaker_create.html b/pinaxcon/templates/symposion/speakers/speaker_create.html index e6eb79b78bb68b4e36247983c575e473debe00ce..4770228eaa7b1fd10c85a731b7729a9fa0499394 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_create.html +++ b/pinaxcon/templates/symposion/speakers/speaker_create.html @@ -5,7 +5,7 @@ {% block head_title %}{% trans "Create Speaker Profile" %}{% endblock %} {% block page_title %}{% trans "Create Speaker Profile" %}{% endblock %} -{% block proposals_body %} +{% block content %}

    {% csrf_token %}
    diff --git a/pinaxcon/templates/symposion/speakers/speaker_edit.html b/pinaxcon/templates/symposion/speakers/speaker_edit.html index c52c598fd29ab866fcf1e59b004bbff3824b3111..882da49c8d5ca73e19111f8798c2da2cb20378b7 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_edit.html +++ b/pinaxcon/templates/symposion/speakers/speaker_edit.html @@ -5,7 +5,7 @@ {% block head_title %}{% trans "Edit Speaker Profile" %}{% endblock %} {% block page_title %}{% trans "Edit Speaker Profile" %}{% endblock %} -{% block proposals_body %} +{% block content %} {% csrf_token %}
    diff --git a/pinaxcon/templates/symposion/speakers/speaker_profile.html b/pinaxcon/templates/symposion/speakers/speaker_profile.html index 6231c4d98041be729e5a4dc6ff9f1725b83010fe..df32f6773fedb76121dbbefd68b3b75569c87600 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_profile.html +++ b/pinaxcon/templates/symposion/speakers/speaker_profile.html @@ -1,47 +1,45 @@ -{% extends "site_base.html" %} +{% extends "symposion/speakers/base.html" %} {% load i18n %} {% load lca2018_tags %} {% load thumbnail %} -{% if speaker.photo %} - {% block header_inset_image %}{% speaker_photo speaker 512 as speaker_photo %}{{ speaker_photo }}{% endblock %} -{% endif %} - -{% block header_title %}{{ speaker.name }}{% endblock %} - -{% block header_paragraph %} -{% endblock %} - {% block head_title %}{{ speaker.name }}{% endblock %} +{% block page_title %}{{ speaker.name }}{% endblock %} {% block content %} - {% if speaker.user == request.user or request.user.is_staff %} -

    - Edit -

    - {% endif %} - -

    Biography

    - -
    {{ speaker.biography_html|safe }}
    - -

    Presentations

    - -
      - {% for presentation in presentations %} -
    • - {{ presentation.title }} - {% if presentation.slot %} - – - {{ presentation.slot.day.date|date:"l" }} - {{ presentation.slot.start}}–{{ presentation.slot.end }} - in - {{ presentation.slot.rooms|join:", " }} - {% endif %} -
    • - {% empty %} -

      No presentations. This page is only visible to staff until there is a presentation.

      - {% endfor %} -
    +
    +
    + {% if speaker.user == request.user or request.user.is_staff %} + Edit + {% endif %} + +

    Biography

    + +
    {{ speaker.biography_html|safe }}
    + +

    Presentations

    + +
      + {% for presentation in presentations %} +
    • + {{ presentation.title }} + {% if presentation.slot %} + – + {{ presentation.slot.day.date|date:"l" }} + {{ presentation.slot.start}}–{{ presentation.slot.end }} + in + {{ presentation.slot.rooms|join:", " }} + {% endif %} +
    • + {% empty %} +
    • No presentations. This page is only visible to staff until there is a presentation.
    • + {% endfor %} +
    +
    +
    + {% speaker_photo speaker 512 as speaker_photo_url %} + {{ speaker.name }} +
    +
    {% endblock %}