From 929388220cfc07277ffbb2bfa9971891a71cf2a0 Mon Sep 17 00:00:00 2001
From: Joel Addison <joel@addison.net.au>
Date: Mon, 21 Oct 2019 09:07:50 +1000
Subject: [PATCH] Update speaker styling

Use site base template for all pages.
Fix speaker profile to work with Bootstrap 4.
---
 .../schedule/presentation_detail.html         |  2 +-
 .../templates/symposion/speakers/base.html    |  7 +-
 .../symposion/speakers/speaker_create.html    |  2 +-
 .../symposion/speakers/speaker_edit.html      |  2 +-
 .../symposion/speakers/speaker_profile.html   | 66 +++++++++----------
 5 files changed, 36 insertions(+), 43 deletions(-)

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