From 94779c0907e83cbb7fab47cc75abce07dffcbd3c Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 27 May 2018 23:02:34 +0200
Subject: [PATCH] Combine partials

---
 source/_partials/nav.html.twig             |  0
 source/_partials/sidebar.html.twig         |  0
 source/_partials/speakerdeck.html.twig     |  1 -
 source/_partials/talks-table-row.html.twig | 59 -------------------
 source/_partials/talks-table.html.twig     | 66 ++++++++++++++++++++--
 source/_partials/tweet.html.twig           |  5 --
 6 files changed, 62 insertions(+), 69 deletions(-)
 delete mode 100644 source/_partials/nav.html.twig
 delete mode 100644 source/_partials/sidebar.html.twig
 delete mode 100644 source/_partials/speakerdeck.html.twig
 delete mode 100644 source/_partials/talks-table-row.html.twig
 delete mode 100644 source/_partials/tweet.html.twig

diff --git a/source/_partials/nav.html.twig b/source/_partials/nav.html.twig
deleted file mode 100644
index e69de29b..00000000
diff --git a/source/_partials/sidebar.html.twig b/source/_partials/sidebar.html.twig
deleted file mode 100644
index e69de29b..00000000
diff --git a/source/_partials/speakerdeck.html.twig b/source/_partials/speakerdeck.html.twig
deleted file mode 100644
index 9fd51d7d..00000000
--- a/source/_partials/speakerdeck.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-<script async class="speakerdeck-embed" data-id="{{ data_id }}" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
diff --git a/source/_partials/talks-table-row.html.twig b/source/_partials/talks-table-row.html.twig
deleted file mode 100644
index 0aba9541..00000000
--- a/source/_partials/talks-table-row.html.twig
+++ /dev/null
@@ -1,59 +0,0 @@
-<tr>
-    <td>
-        {{ row.event.date|date(row.event.fuzzy_date ? 'F Y' : 'j F Y') }}
-
-        {% if row.event.time is defined %}
-            <div class="text-xs text-grey-dark">
-                {{ row.event.time }}
-            </div>
-        {% endif %}
-    </td>
-
-    {% if not talk_page %}
-        <td>
-            {% if row.talk.url is not empty %}
-                <a href="{{ row.talk.url }}">
-                    {{ row.talk.title }}
-                </a>
-            {% else %}
-                {{  row.talk.title }}
-            {% endif %}
-
-            <div class="text-xs text-grey-dark">
-                {% if row.talk.type %}
-                    {{ row.talk.type }}
-                {% else %}
-                    {{ row.event.type|default('Talk') }}
-                {% endif %}
-            </div>
-        </td>
-    {% endif %}
-
-    <td>
-        {% if row.event.website is not empty %}
-            <a href="{{ row.event.website }}">
-                {{ row.event.name }}
-            </a>
-        {% else %}
-            {{ row.event.name }}
-        {% endif %}
-
-        {% if row.event.location is defined %}
-            <div class="text-xs text-grey-dark">
-                {{ row.event.location }}
-            </div>
-        {% endif %}
-    </td>
-
-    {% if not upcoming %}
-        <td>
-            {% if row.event.joindin and row.event.date <= today %}
-                <a href="{{ row.event.joindin }}"
-                   class="button"
-                   title="Read or leave feedback for this talk">
-                    <i class="fa fa-comment-o"></i> joind.in
-                </a>
-            {% endif %}
-        </td>
-    {% endif %}
-</tr>
diff --git a/source/_partials/talks-table.html.twig b/source/_partials/talks-table.html.twig
index 4dd604a3..b35be735 100644
--- a/source/_partials/talks-table.html.twig
+++ b/source/_partials/talks-table.html.twig
@@ -16,10 +16,68 @@
             </tr>
         </thead>
         <tbody>
-            {% for row in talks %}
-                {% include "talks-table-row" with {
-                    today: 'today'|date('Y-m-d')
-                } %}
+            {% for talk in talks %}
+                <tr>
+                    <td>
+                        {{ talk.event.date|date(talk.event.fuzzy_date ? 'F Y' : 'j F Y') }}
+
+                        {% if talk.event.time is defined %}
+                            <div class="text-xs text-grey-dark">
+                                {{ talk.event.time }}
+                            </div>
+                        {% endif %}
+                    </td>
+
+                    {% if not talk_page %}
+                        <td>
+                            {% if talk.talk.url is not empty %}
+                                <a href="{{ talk.talk.url }}">
+                                    {{ talk.talk.title }}
+                                </a>
+                            {% else %}
+                                {{  talk.talk.title }}
+                            {% endif %}
+
+                            <div class="text-xs text-grey-dark">
+                                {% if talk.talk.type %}
+                                    {{ talk.talk.type }}
+                                {% else %}
+                                    {{ talk.event.type|default('Talk') }}
+                                {% endif %}
+                            </div>
+                        </td>
+                    {% endif %}
+
+                    <td>
+                        {% if talk.event.website is not empty %}
+                            <a href="{{ talk.event.website }}">
+                                {{ talk.event.name }}
+                            </a>
+                        {% else %}
+                            {{ talk.event.name }}
+                        {% endif %}
+
+                        {% if talk.event.location is defined %}
+                            <div class="text-xs text-grey-dark">
+                                {{ talk.event.location }}
+                            </div>
+                        {% endif %}
+                    </td>
+
+                    {% if not upcoming %}
+                        <td>
+                            {% if talk.event.joindin and talk.event.date <= 'today'|date('Y-m-d') %}
+                                <a
+                                    href="{{ talk.event.joindin }}"
+                                    class="button"
+                                    title="Read or leave feedback for this talk"
+                                >
+                                    <i class="fa fa-comment-o"></i> joind.in
+                                </a>
+                            {% endif %}
+                        </td>
+                    {% endif %}
+                </tr>
             {% endfor %}
         </tbody>
     </table>
diff --git a/source/_partials/tweet.html.twig b/source/_partials/tweet.html.twig
deleted file mode 100644
index a6fd2b0d..00000000
--- a/source/_partials/tweet.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>
-    <blockquote class="twitter-tweet" data-cards="hidden" lang="en">
-        {{ content|raw }}
-    </blockquote>
-</p>