- {% include "place-meta.html" %}
- {{ content }}
-
-
-
- Last Updated: {{ page.last_modified_at | date: "%-d %B %Y" }}
-
-
-
-
- {% assign place_images = site.static_files | where: "place_image", true | reverse %}
- {% for image in place_images %}
- {% assign end_image_index = image.path.size | minus: 22 %}
- {% assign search_image = image.path | slice: 15, end_image_index %}
-
- {% assign end_page_index = page.path.size | minus: 11 %}
- {% assign search_page = page.path | slice: 8, end_page_index %}
-
- {% if search_image == search_page %}
-
- {% endif %}
- {% endfor %}
-
-
-
-
- Tags:
- {% assign tags = page.tags | sort %}
- {% for tag in tags %}{% unless forloop.first %}, {% endunless %}
- {% assign tag_page = site.tags | where: "slug", tag | first %}
- {% if tag_page %}{% endif %}{{ tag }}{% if tag_page %}{% endif %}{% endfor %}
-
-
-
+ {% include "place-meta.html" %}
+ {{ content }}
+
+
+
+ Last Updated: {{ last_modified_at | date: "%-d %B %Y" }}
+
+
+
+
+
+ {% assign place_images = collections.place_images | reverse %}
+ {% for image in place_images %}
+ {% capture absolute_url %}/{{image}}{% endcapture %}
+ {% assign folder_size = absolute_url.size | minus: 6 %}
+ {% capture absolute_folder %}{{ absolute_url | slice: 0, folder_size }}{% endcapture %}
+ {% if absolute_folder == page.url %}
+
+ {% endif %}
+ {% endfor %}
+
+
+
+
+ Tags:
+ {% assign tags = tags | sort | remove: "places" %}
+ {% for tag in tags %}{% unless forloop.first %}, {% endunless %}
+ {% assign tag_page = site.tags | where: "slug", tag | first %}
+ {% if tag_page %}{% endif %}{{ tag }}{% if tag_page %}{% endif %}{% endfor %}
+
+
+
{{ content }}
{% if chains.size > 0 %}
-
{{ page.non_chain_intro }}
+
{{ non_chain_intro }}
{% endif %}
@@ -19,7 +19,7 @@ layout: default
{% if chains.size > 0 %}
- {{ page.chain_intro }}
+ {{ chain_intro }}
{% for place in collections.restaurants %}
diff --git a/_includes/layouts/tags.html b/_includes/layouts/tags.html
deleted file mode 100644
index 3591f9a..0000000
--- a/_includes/layouts/tags.html
+++ /dev/null
@@ -1,53 +0,0 @@
----
-layout: default
-title: Tag
----
-
-{{content}}
-
-
- Tag List
-
-
-{% assign rawtags = "" %}
-{% for place in site.places %}
- {% assign ttags = place.tags | join:'|' | append:'|' %}
- {% assign rawtags = rawtags | append:ttags %}
-{% endfor %}
-{% assign rawtags = rawtags | split:'|' | sort %}
-{% assign tags = "" %}
-{% for tag in rawtags %}
- {% if tag != "" %}
- {% if tags == "" %}
- {% assign tags = tag | split:'|' %}
- {% endif %}
- {% unless tags contains tag %}
- {% assign tags = tags | join:'|' | append:'|' | append:tag | split:'|' %}
- {% endunless %}
- {% endif %}
-{% endfor %}
-
-
-
- {% for tag in tags %}
- {% assign tag_page = null %}
- {% for col_tag in collections.tags %}
- {% if col_tag.name == tag %}
- {% assign tag_page = col_tag %}
- {% endif %}
- {% endfor %}
- -
- {% if tag_page %}{% endif %}
- {{ tag | capitalize }}
- {% if tag_page %}{% endif %}
-
- {% for place in site.places %}
- {% if place.tags contains tag %}
- {% include filtered-place.html, place=place, detailed=false %}
- {% endif %}
- {% endfor %}
-
-
- {% endfor %}
-
-
+ Tag List
+
+
+{% assign rawtags = "" %}
+{% for place in collections.places %}
+ {% assign ttags = place.data.tags | join:'|' | append:'|' | remove: "places" %}
+ {% assign rawtags = rawtags | append:ttags %}
+{% endfor %}
+{% assign rawtags = rawtags | split:'|' | sort %}
+
+{% assign show_tags = "" %}
+{% for tag in rawtags %}
+ {% if tag != "" %}
+ {% if show_tags == "" %}
+ {% assign show_tags = tag | split:'|' %}
+ {% endif %}
+ {% unless show_tags contains tag %}
+ {% assign show_tags = show_tags | join:'|' | append:'|' | append:tag | split:'|' %}
+ {% endunless %}
+ {% endif %}
+{% endfor %}
+
+
+
+ {% for tag in show_tags %}
+ {% assign tag_page = null %}
+ {% for col_tag in collections.tag_pages %}
+ {% if col_tag.data.show == tag %}
+ {% assign tag_page = col_tag %}
+ {% endif %}
+ {% endfor %}
+ -
+ {% if tag_page != null %}{% endif %}
+ {{ tag | capitalize }}
+ {% if tag_page %}{% endif %}
+
+ {% for place in collections.places %}
+ {% if place.data.tags contains tag %}
+ {% include "filtered-place", place: place, detailed: false %}
+ {% endif %}
+ {% endfor %}
+
+
+ {% endfor %}
+
+