From 040cc805b29a3583c8255dc8c39e6a4f66dd1c0d Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sat, 23 Sep 2017 06:45:54 +0100
Subject: [PATCH] Simplify availability includes

---
 source/_includes/availability.html.twig         | 6 ++++--
 source/_includes/availability/limited.html.twig | 8 ++------
 source/_includes/availability/no.html.twig      | 8 ++------
 source/_includes/availability/yes.html.twig     | 8 ++------
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/source/_includes/availability.html.twig b/source/_includes/availability.html.twig
index 78e2612d..39370c2a 100644
--- a/source/_includes/availability.html.twig
+++ b/source/_includes/availability.html.twig
@@ -2,8 +2,10 @@
     <h2>Availability</h2>
 
     <ul class="list pa0">
-        {% for key, availability in site.availability %}
-            {% include 'availability/' ~ availability with { value: key } %}
+        {% for type, value in site.availability %}
+            <li>
+                {% include 'availability/' ~ value %}
+            </li>
         {% endfor %}
     </ul>
 </div>
diff --git a/source/_includes/availability/limited.html.twig b/source/_includes/availability/limited.html.twig
index 7ac76700..eca6174e 100644
--- a/source/_includes/availability/limited.html.twig
+++ b/source/_includes/availability/limited.html.twig
@@ -1,6 +1,2 @@
-<li>
-    <i class="mr1 fa fa-thumbs-o-up orange"></i>
-
-    {{ value == 'full' ? 'Currently have limited full-time capacity' }}
-    {{ value == 'part' ? 'Currently have limited part-time capacity' }}
-</li>
+<i class="mr1 fa fa-thumbs-o-up orange"></i>
+Currently have limited {{ type }}-time capacity.
diff --git a/source/_includes/availability/no.html.twig b/source/_includes/availability/no.html.twig
index 60e46ec9..256df14a 100644
--- a/source/_includes/availability/no.html.twig
+++ b/source/_includes/availability/no.html.twig
@@ -1,6 +1,2 @@
-<li>
-    <i class="mr1 fa fa-thumbs-o-down dark-red"></i>
-
-    {{ value == 'full' ? 'Currently no spare full-time capacity.' }}
-    {{ value == 'part' ? 'Currently no spare part-time capacity.' }}
-</li>
+<i class="mr1 fa fa-thumbs-o-down dark-red"></i>
+Currently no spare {{ type }}-time capacity.
diff --git a/source/_includes/availability/yes.html.twig b/source/_includes/availability/yes.html.twig
index 0d858578..350e7b0f 100644
--- a/source/_includes/availability/yes.html.twig
+++ b/source/_includes/availability/yes.html.twig
@@ -1,6 +1,2 @@
-<li>
-    <i class="mr1 fa fa-thumbs-o-up dark-green"></i>
-
-    {{ value == 'full' ? 'Currently have available full-time capacity' }}
-    {{ value == 'part' ? 'Currently have available part-time capacity' }}
-</li>
+<i class="mr1 fa fa-thumbs-o-up dark-green"></i>
+Currently have available {{ type }}-time capacity.