From b27fbadc423f63bfddf2f717cb6e1e9c333bf7b1 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 3 May 2019 14:52:51 +0100
Subject: [PATCH] Update speakers layout

---
 source/_layouts/speaker.html.twig          |  51 ++++++++++++++++++---
 source/_speakers/tom-metcalfe.md           |   4 +-
 source/themes/dcb2017/images/drop-1.png    | Bin 0 -> 922 bytes
 source/themes/dcb2017/images/twitter-1.png | Bin 0 -> 858 bytes
 4 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 source/themes/dcb2017/images/drop-1.png
 create mode 100644 source/themes/dcb2017/images/twitter-1.png

diff --git a/source/_layouts/speaker.html.twig b/source/_layouts/speaker.html.twig
index ddd8353..761849b 100644
--- a/source/_layouts/speaker.html.twig
+++ b/source/_layouts/speaker.html.twig
@@ -2,12 +2,49 @@
 
 {% block title %}{{ page.name }}{% endblock %}
 
-{% block content_bottom %}
-  <h3>Session</h3>
+{% block content_wrapper_inner %}
+  <div class="tw-flex tw--mx-4">
+    {% if page.image %}
+      <div class="tw-px-4 tw-flex-0 tw-w-48">
+        <img class="tw-max-w-full" src="/images/speakers/{{ page.image }}" alt="{{ page.name }}">
+      </div>
+    {% endif %}
 
-  {% for session in data.sessions if page.name in session.speakers %}
-    <a href="{{ session.url }}">
-      {{ session.title }}
-    </a>
-  {% endfor %}
+    <div class="tw-px-4 tw-flex-1">
+      {% if page.links %}
+        <div class="tw-flex">
+          {% if page.links.drupalorg %}
+            <div class="tw-pl-6 tw-mr-4" style="background: url(/themes/dcb2017/images/drop-1.png) no-repeat left center transparent">
+              <a href="https://www.drupal.org/u/{{ page.links.drupalorg }}">{{ page.links.drupalorg }}</a>
+           </div>
+          {% endif %}
+
+          {% if page.links.twitter %}
+            <div class="tw-pl-6 tw-mr-4" style="background: url(/themes/dcb2017/images/twitter-1.png) no-repeat left center transparent">
+              <a href="https://twitter.com/{{ page.links.twitter }}">{{ page.links.twitter }}</a>
+            </div>
+          {% endif %}
+        </div>
+      {% endif %}
+
+      <div class="markup">
+        {% if page.organisation %}
+        <b>Organisation</b>: {{ page.organisation }}
+        {% endif %}
+
+        {% block content %}{% endblock %}
+      </div>
+    </div>
+  </div>
+{% endblock %}
+
+{% block content_bottom %}
+    <h3>Session</h3>
+
+    {% for session in data.sessions if page.name in session.speakers %}
+      <a href="{{ session.url }}">
+        {{ session.title }}
+      </a>
+    {% endfor %}
+  </aside>
 {% endblock %}
diff --git a/source/_speakers/tom-metcalfe.md b/source/_speakers/tom-metcalfe.md
index 8ba41b1..d651cbd 100644
--- a/source/_speakers/tom-metcalfe.md
+++ b/source/_speakers/tom-metcalfe.md
@@ -1,6 +1,8 @@
 ---
 name: Tom Metcalfe
-twitter: tommymets9
+organisation: Reason Digital
+links:
+  twitter: tommymets9
 use:
   - sessions
 ---
diff --git a/source/themes/dcb2017/images/drop-1.png b/source/themes/dcb2017/images/drop-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f628d10114d0efdee6244260a6442a5e00100f7
GIT binary patch
literal 922
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><YADU|=i{@CkAK|Nnn(ZmzVn
zbWBVPQ1R5MQ&+BBsjsge8X7u%`g8{ehnFv3s;jHNdGkigJu)gfhJ}--Xz3Bn>?u>H
z&j4!CF}K}z^c+L<WCnG621e$__U^3*PwLxyxcLTNzyE}*V0~@ZBsF#Qk{Rn5e5*Az
zwbVRfHJyXi@@8u$HY?R_SIL>KP`6#HXs$xu{G#b=6?`&c@~UzQin()^U%mGvuc%bX
z+=U^mODKI-VtI?QxeHHJhgrn}1}Uxlq7pfW5V@#2xr`~g#d9r-rfB%3scY*xPCvs?
zyzBR$ze~<O=d9TC>BsN>Ll60?_HDcV#&zadrjlJEb^BRLcQeFIXUN;c5ZT92xSb((
z8f)3^`W<&pJovEg@=LP`Cm0I0n%6FC+i<db|9xQi{Q3K@cmG|D(j|Rc&;0rO_tLY^
zCvHEhT5;sXhp!ApJ6m_(ee~v2!i*g;Q?}(U*r!>%;OV>143YiXr3+1}m$F3n%jV1$
zO`9%~Ha%&^&hq7lQ)lhUTd-f=<j+-LaJ!ZS`GKMl38b)zy;;P@6!Pd=8i&FmEwvY~
z)L1T@VTlS_x8laNJ9l>NDJbH5_Daa<$1e}3CoepBGPc~hvm=Mk{N!C#pec+=-tI08
z9jvk*Kn{C}r>`sfLslscZDFa<?Vx0H-qXb~MB;LC0t1tqnwni5o63PRN(ve(XHK1B
z6BZB@EiM(FJ|U(3)6yk(ZEfz}xpO4-Kn!1`rGCD=xxj?*2P|9~T0ejN-0j$~i7UXt
zRN(?ITho;WrdI{)q6<3M0vv?T@$+(DWa7%$y|dNb#m#m1QI?~}UNW$j+`aQiSV%}{
z@}%G(;V%tLzw+`j9U5D{^qgs7VP4R%Ffgpl$;mG-uFi4cM$Qwd%hFtrsxD1UeJc7)
zEMa+3WK?TQNLc9gh}#9uw#nJ)?;pH)^5)Rt(+3zByk;7H6|OoK3iO(4iEBhjN@7W>
zRdP`(kYX@0Ff`XSFx53O3o)>;GBLI?wA3~*ure_C7va4fMMG|WN@iLmZVmmcpSgh=
O7(8A5T-G@yGywpQl4?Kz

literal 0
HcmV?d00001

diff --git a/source/themes/dcb2017/images/twitter-1.png b/source/themes/dcb2017/images/twitter-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d65a77e23811e8a555dc62ca46a3f059c180f6b
GIT binary patch
literal 858
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><YADU|`e<@CkAK|Nno${M&&G
z?gTEnAGq*t(BcPy3-1Ljei*dmQP9%I!AqY6FMl4g@@2@17s1P)K~*li3sMYHe-ES)
zjv(Ac_d$BW<^a_I*-&K*?*%V=61?mwNO18(pn+f$?gF&~6$5Pna)E-OtKR}G1+qc*
zu6hO39=rnN0HEHGRj)(WyakGbL{_~9xeX!+)Ux6^Nd4+JKm{QyUxA#o@GejmXc~|U
zv<{?l#S4f6pc;_)s#hRgKqmoB1Nv^+Q=owmD}c&?x`393u6YMk33LNcF)*MOnj72(
z254wWkRK@Qk%25n_uG$iM1$4D-xw_Wx6)AaOAe#>zo$BEFD~V2>bVM+{WKH$`%iG@
zIkx`q>BsML${hb=%eUfBl3w-4yG}N<Z+`v#a6>GcuXjE$G8q_?yxm<GI#^{rfE@M`
zPhVH|hpbW@+9EB6N(+EOr#xL8LnJOICpfV8WHdBRls_aOAR;6tC@P#jVZs!qk29Az
zA3mg<lJZpIiL$83R0+wcp^FwRPEHEFDsjd1k&@}wEv1hZJ%0RHxMZf}moL1F4mk-s
zFK+nrL&I5&P5E)lkCqurG$u4v2nVaNrEPAhurNqZO-k6jVN26T;WaZQC1*tBKJdzU
z8_~d*yt%yLlkD6XGaHzE-kj4*5RScTF{8n+{QHD&J*=D+mBpJH{~UVs`1Nyn0SOVA
zLkEws2qh#vd-Uw#!>5l^(wM4+7>+sWu_cMRSOR^eTH+c}l9E`GYL#4+3Zxi}3=GY6
z4NP^7%t8z-tW1opj106546F<cp89jPqiD#@PsvQH#I0e9&_-*Z1_n=8KbLh*2~7aY
C3wpo+

literal 0
HcmV?d00001