Merge branch 'master' into talks

2015-09-16 08:42:05 +01:00 · 2015-09-16 08:42:05 +01:00 · bd1c285366
commit bd1c285366
parent 55d1474ee9 d19c85404d
34 changed files with 73 additions and 57 deletions
--- a/source/_includes/talk-listing-item.html.twig
+++ b/source/_includes/talk-listing-item.html.twig
@ -0,0 +1,15 @@
+<li>
+    <strong>{% spaceless %}
+        {% if talk.fuzzy_date %}
+            {{ talk.date|date('F') }}
+        {% else %}
+            {{ talk.date|date('jS F') }}
+        {% endif %}
+    {% endspaceless %}</strong> - {{ talk.event.name }}
+    -
+    {% if talk.fuzzy_date %}
+        {{ talk.title }}
+    {% else %}
+        <a href="{{ talk.url }}">{{ talk.title }}</a>
+    {% endif %}
+</li>