diff --git a/pinaxcon/templates/symposion/schedule/presentation_detail.html b/pinaxcon/templates/symposion/schedule/presentation_detail.html index 6cd14ff3..8234f79c 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 eaf4e530..c8015152 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 e6eb79b7..4770228e 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 c52c598f..882da49c 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 6231c4d9..df32f677 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 %} +
    +
    + {% if speaker.user == request.user or request.user.is_staff %} + Edit + {% endif %} -

    Biography

    +

    Biography

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

    Presentations

    +

    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 %} -
    +
      + {% 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 %}