Update speaker styling

Use site base template for all pages.
Fix speaker profile to work with Bootstrap 4.
This commit is contained in:
Joel Addison 2019-10-21 09:07:50 +10:00
parent 1022a42cf7
commit 929388220c
5 changed files with 36 additions and 43 deletions

View file

@ -26,7 +26,7 @@
{% for speaker in presentation.speakers %}
<li class="mb-4 pb-2">
{% speaker_photo speaker 120 as speaker_photo_url %}
<img src="{{ speaker_photo_url }}" class="rounded-circle">
<img src="{{ speaker_photo_url }}" alt="{{ speaker }}" class="rounded-circle img-fluid">
<p>
<strong>{{ speaker }}</strong><br />
{% if speaker.twitter_username %}

View file

@ -1,6 +1 @@
{% extends "utility_page.html" %}
{% block utility_body %}
{% block proposals_body %}
{% endblock %}
{% endblock %}
{% extends "site_base.html" %}

View file

@ -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 %}
<form class="form-horizontal" method="POST" action="" enctype="multipart/form-data">
{% csrf_token %}
<fieldset>

View file

@ -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 %}
<form class="form-horizontal" method="POST" action="" enctype="multipart/form-data">
{% csrf_token %}
<fieldset>

View file

@ -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 %}
<p>
<a class="btn btn-default pull-right" href="{% url "speaker_edit" speaker.pk %}">Edit</a>
</p>
{% endif %}
<div class="row">
<div class="col-md-8">
{% if speaker.user == request.user or request.user.is_staff %}
<a class="btn btn-secondary float-right" href="{% url "speaker_edit" speaker.pk %}">Edit</a>
{% endif %}
<h3>Biography</h3>
<h3>Biography</h3>
<div class="bio">{{ speaker.biography_html|safe }}</div>
<div class="bio">{{ speaker.biography_html|safe }}</div>
<h3>Presentations</h3>
<h3>Presentations</h3>
<ul>
{% for presentation in presentations %}
<li>
<a href="{% url "schedule_presentation_detail" presentation.pk %}">{{ presentation.title }}</a>
{% if presentation.slot %}
&ndash;
{{ presentation.slot.day.date|date:"l" }}
{{ presentation.slot.start}}&ndash;{{ presentation.slot.end }}
in
{{ presentation.slot.rooms|join:", " }}
{% endif %}
</li>
{% empty %}
<p>No presentations. This page is only visible to staff until there is a presentation.</p>
{% endfor %}
</ul>
<ul>
{% for presentation in presentations %}
<li>
<a href="{% url "schedule_presentation_detail" presentation.pk %}">{{ presentation.title }}</a>
{% if presentation.slot %}
&ndash;
{{ presentation.slot.day.date|date:"l" }}
{{ presentation.slot.start}}&ndash;{{ presentation.slot.end }}
in
{{ presentation.slot.rooms|join:", " }}
{% endif %}
</li>
{% empty %}
<li>No presentations. This page is only visible to staff until there is a presentation.</li>
{% endfor %}
</ul>
</div>
<div class="col-md-4">
{% speaker_photo speaker 512 as speaker_photo_url %}
<img src="{{ speaker_photo_url }}" alt="{{ speaker.name }}" class="rounded-circle img-fluid">
</div>
</div>
{% endblock %}