Skip to content

Commit 3ac425d

Browse files
gregagrega
committed
Migrate to "Overview" template, reduce duplication
1 parent d9b5c5a commit 3ac425d

18 files changed

+41
-254
lines changed

‎_includes/overview.html

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{% assign whisky_type = include.name | downcase %}
2+
3+
{% capture tried_table_id %}{{ 'Tried' | prepend: whisky_type }}{% endcapture%}
4+
{% capture to_try_table_id %}{{ 'ToTry' | prepend: whisky_type }}{% endcapture%}
5+
6+
<h2 class="title is-2">{{ include.name }}</h2>
7+
<div class="columns">
8+
<div class="column is-6">
9+
<h3 class="title is-4">Tried</h3>
10+
{% if site.data[whisky_type].tried %}
11+
{% assign tried_sorted = site.data[whisky_type].tried | sort: 'name' %}
12+
{% include whiskys.html whiskys=tried_sorted tableID=tried_table_id triedTable=true %}
13+
{% endif %}
14+
</div>
15+
16+
<div class="column is-5 is-offset-1">
17+
<h3 class="title is-4">To Try</h3>
18+
{% if site.data[whisky_type].to_try %}
19+
{% assign to_try_sorted = site.data[whisky_type].to_try | sort: 'name' %}
20+
{% include whiskys.html whiskys=to_try_sorted tableID=to_try_table_id toTryTable=true %}
21+
{% endif %}
22+
{% include whisky_suggestion.html name=whisky_type %}
23+
</div>
24+
</div>

‎_includes/whisky_suggestion.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
<button class="button is-primary" type="submit">Submit</button>
1111
</div>
1212
</div>
13-
<p class="hidden"><label>Don’t fill this out if you're human: <input name="bot-field-8a7d9e"></label></p>
13+
<p class="hidden"><label>Don't fill this out if you're human: <input name="bot-field-8a7d9e"></label></p>
1414
</form>

‎american.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: American
44
---
55

6-
<h2 class="title is-2">American</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign american_tried_sorted = site.data.american.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=american_tried_sorted tableID="americanTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.american.to_try %}
17-
{% assign american_to_try_sorted = site.data.american.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=american_to_try_sorted tableID="americanToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="american" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎australian.html

+1-13
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,4 @@
33
title: Australian
44
---
55

6-
<h2 class="title is-2">Australian</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% if site.data.australian.tried %} {% assign australian_tried_sorted = site.data.australian.tried | sort: 'name' %} {% include whiskys.html whiskys=australian_tried_sorted tableID="australianTried" triedTable=true %} {% endif %}
11-
</div>
12-
13-
<div class="column is-5 is-offset-1">
14-
<h3 class="title is-4">To Try</h3>
15-
{% if site.data.australian.to_try %} {% assign australian_to_try_sorted = site.data.australian.to_try | sort: 'name' %} {% include whiskys.html whiskys=australian_to_try_sorted tableID="australianToTry" toTryTable=true %} {% endif %} {% include whisky_suggestion.html
16-
name="australian" %}
17-
</div>
18-
</div>
6+
{% include overview.html name=page.title %}

‎canadian.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: Canadian
44
---
55

6-
<h2 class="title is-2">Canadian</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign canadian_tried_sorted = site.data.canadian.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=canadian_tried_sorted tableID="canadianTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.canadian.to_try %}
17-
{% assign canadian_to_try_sorted = site.data.canadian.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=canadian_to_try_sorted tableID="canadianToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="canadian" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎danish.html

+1-13
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,4 @@
33
title: Danish
44
---
55

6-
<h2 class="title is-2">Danish</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign danish_tried_sorted = site.data.danish.tried | sort: 'name' %} {% include whiskys.html whiskys=danish_tried_sorted tableID="danishTried" triedTable=true %}
11-
</div>
12-
13-
<div class="column is-5 is-offset-1">
14-
<h3 class="title is-4">To Try</h3>
15-
{% if site.data.danish.to_try %} {% assign danish_to_try_sorted = site.data.danish.to_try | sort: 'name' %} {% include whiskys.html whiskys=danish_to_try_sorted tableID="danishToTry" toTryTable=true %} {% endif %} {% include whisky_suggestion.html name="danish"
16-
%}
17-
</div>
18-
</div>
6+
{% include overview.html name=page.title %}

‎english.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: English
44
---
55

6-
<h2 class="title is-2">English</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign english_tried_sorted = site.data.english.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=english_tried_sorted tableID="englishTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.english.to_try %}
17-
{% assign english_to_try_sorted = site.data.english.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=english_to_try_sorted tableID="englishToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="english" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎finnish.html

+1-13
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,4 @@
33
title: Finnish
44
---
55

6-
<h2 class="title is-2">Finnish</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign finnish_tried_sorted = site.data.finnish.tried | sort: 'name' %} {% include whiskys.html whiskys=finnish_tried_sorted tableID="finnishTried" triedTable=true %}
11-
</div>
12-
13-
<div class="column is-5 is-offset-1">
14-
<h3 class="title is-4">To Try</h3>
15-
{% if site.data.finnish.to_try %} {% assign finnish_to_try_sorted = site.data.finnish.to_try | sort: 'name' %} {% include whiskys.html whiskys=finnish_to_try_sorted tableID="finnishToTry" toTryTable=true %} {% endif %} {% include whisky_suggestion.html
16-
name="finnish" %}
17-
</div>
18-
</div>
6+
{% include overview.html name=page.title %}

‎french.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: French
44
---
55

6-
<h2 class="title is-2">French</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign french_tried_sorted = site.data.french.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=french_tried_sorted tableID="frenchTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.french.to_try %}
17-
{% assign french_to_try_sorted = site.data.french.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=french_to_try_sorted tableID="frenchToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="french" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎german.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: German
44
---
55

6-
<h2 class="title is-2">German</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign german_tried_sorted = site.data.german.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=german_tried_sorted tableID="germanTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.german.to_try %}
17-
{% assign german_to_try_sorted = site.data.german.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=german_to_try_sorted tableID="germanToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="german" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎indian.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: Indian
44
---
55

6-
<h2 class="title is-2">Indian</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign indian_tried_sorted = site.data.indian.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=indian_tried_sorted tableID="indianTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.indian.to_try %}
17-
{% assign indian_to_try_sorted = site.data.indian.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=indian_to_try_sorted tableID="indianToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="indian" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎irish.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: Irish
44
---
55

6-
<h2 class="title is-2">Irish</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign irish_tried_sorted = site.data.irish.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=irish_tried_sorted tableID="irishTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.irish.to_try %}
17-
{% assign irish_to_try_sorted = site.data.irish.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=irish_to_try_sorted tableID="irishToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="irish" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎japanese.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: Japanese
44
---
55

6-
<h2 class="title is-2">Japanese</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign japanese_tried_sorted = site.data.japanese.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=japanese_tried_sorted tableID="japaneseTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.japanese.to_try %}
17-
{% assign japanese_to_try_sorted = site.data.japanese.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=japanese_to_try_sorted tableID="japaneseToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="japanese" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎mexican.html

+1-13
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,4 @@
33
title: Mexican
44
---
55

6-
<h2 class="title is-2">Mexican</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% if site.data.mexican.tried %} {% assign mexican_tried_sorted = site.data.mexican.tried | sort: 'name' %} {% include whiskys.html whiskys=mexican_tried_sorted tableID="mexicanTried" triedTable=true %} {% endif %}
11-
</div>
12-
13-
<div class="column is-5 is-offset-1">
14-
<h3 class="title is-4">To Try</h3>
15-
{% if site.data.mexican.to_try %} {% assign mexican_to_try_sorted = site.data.mexican.to_try | sort: 'name' %} {% include whiskys.html whiskys=mexican_to_try_sorted tableID="mexicanToTry" toTryTable=true %} {% endif %} {% include whisky_suggestion.html name="mexican"
16-
%}
17-
</div>
18-
</div>
6+
{% include overview.html name=page.title %}

‎scottish.html

+1-13
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,4 @@
33
title: Scottish
44
---
55

6-
<h2 class="title is-2">Scottish</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign scottish_tried_sorted = site.data.scottish.tried | sort: 'name' %} {% include whiskys.html whiskys=scottish_tried_sorted tableID="scottishTried" triedTable=true %}
11-
</div>
12-
13-
<div class="column is-5 is-offset-1">
14-
<h3 class="title is-4">To Try</h3>
15-
{% if site.data.scottish.to_try %} {% assign scottish_to_try_sorted = site.data.scottish.to_try | sort: 'name' %} {% include whiskys.html whiskys=scottish_to_try_sorted tableID="scottishToTry" toTryTable=true %} {% endif %} {% include whisky_suggestion.html
16-
name="scottish" %}
17-
</div>
18-
</div>
6+
{% include overview.html name=page.title %}

‎swedish.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: Swedish
44
---
55

6-
<h2 class="title is-2">Swedish</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign swedish_tried_sorted = site.data.swedish.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=swedish_tried_sorted tableID="swedishTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.swedish.to_try %}
17-
{% assign swedish_to_try_sorted = site.data.swedish.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=swedish_to_try_sorted tableID="swedishToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="swedish" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎taiwanese.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,4 @@
33
title: Taiwanese
44
---
55

6-
<h2 class="title is-2">Taiwanese</h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign taiwanese_tried_sorted = site.data.taiwanese.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=taiwanese_tried_sorted tableID="taiwaneseTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.taiwanese.to_try %}
17-
{% assign taiwanese_to_try_sorted = site.datataiwanese.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=taiwanese_to_try_sorted tableID="taiwaneseToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="taiwanese" %}
21-
</div>
22-
</div>
6+
{% include overview.html name=page.title %}

‎welsh.html

+1-18
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,4 @@
33
title: Welsh
44
---
55

6-
<h2 class="title is-2">Welsh<h2>
7-
<div class="columns">
8-
<div class="column is-6">
9-
<h3 class="title is-4">Tried</h3>
10-
{% assign welsh_tried_sorted = site.data.welsh.tried | sort: 'name' %}
11-
{% include whiskys.html whiskys=welsh_tried_sorted tableID="welshTried" triedTable=true %}
12-
</div>
13-
14-
<div class="column is-5 is-offset-1">
15-
<h3 class="title is-4">To Try</h3>
16-
{% if site.data.welsh.to_try %}
17-
{% assign welsh_to_try_sorted = site.data.welsh.to_try | sort: 'name' %}
18-
{% include whiskys.html whiskys=welsh_to_try_sorted tableID="welshToTry" toTryTable=true %}
19-
{% endif %}
20-
{% include whisky_suggestion.html name="welsh" %}
21-
</div>
22-
</div>
23-
6+
{% include overview.html name=page.title %}

0 commit comments

Comments
 (0)