Authors
--
- {% comment %}
- Create an array of maps to make the full name of authors the top level property.
- This is a workaround because it is not possible to sort on a sub-property in Jekyll.
- {% endcomment %}
- {% assign unsortedauthors = "" | split: ',' %}
- {% for a in site.data.authors.authors %}
- {% comment %}
- Create a map with one hash from the author's full name to their username
- {% endcomment %}
- {% assign processedauthor = "" | split: ',' %}
- {% assign processedauthor = processedauthor | push: a[1].name %}
- {% assign processedauthor = processedauthor | push: a[0] %}
- {% assign unsortedauthors = unsortedauthors | push: processedauthor %}
- {% endfor %}
- {% comment %}
- Sort and filter the new array so it is in alphabetical order of full name
- {% endcomment %}
- {% assign sortedauthors = (unsortedauthors | sort) %}
- {% for author in sortedauthors %}
- {% comment %}
- Exclude all authors that are not active (defined in _data/authors.yml file).
- {% endcomment %}
- {% if site.data.authors.active-authors contains author[1] %}
-
- - - {{ author[0] }} - - - {% endif %} - {% endfor %} -
- {% endif %}
-{% else %}
-
-{% endif %}
+{%- assign author = include.author -%}
+{%- if author.picture -%}
+ {%- if author-id -%}
+ 
+ {%- endif -%}
+{%- else -%}
+
+{%- endif -%}
diff --git a/_includes/author_summary.html b/_includes/author_summary.html
index b90926f283..ae9b3c4100 100644
--- a/_includes/author_summary.html
+++ b/_includes/author_summary.html
@@ -1,15 +1,18 @@
-{% assign author-id = include.author-id %}
-{% assign author = site.data.authors.authors[author-id] %}
-
- {% include author_picture.html author-id=author-id %}
- {{ author.name }}
+{%- assign author-id = include['author-id'] -%}
+{%- assign author = site.data.authors.authors[author-id] -%}
+
-
- {{ author.author-summary }}
- {% if author.twitter-url %}
- {% assign twitter-url-split = author.twitter-url | split: '/' %}
-
- {% endif %}
-
\ No newline at end of file
diff --git a/_includes/category_display.html b/_includes/category_display.html
index 0c7676695a..50b108de30 100644
--- a/_includes/category_display.html
+++ b/_includes/category_display.html
@@ -1,28 +1,8 @@
-{% assign post = include.post %}
-{% assign read_more = include.read_more %}
-{% assign found_category = "false" %}
-
-
- {% for post_category in post.categories | downcase %}
- {% if found_category == "true" %}
- {% break %}
- {% endif %}
- {% for category in site.data.categories %}
- {% if post_category == category.title | downcase %}
- {% assign found_category = "true" %}
-
- {% if read_more %}
- View all {{ category.title }} articles
- {% else %}
- {{ category.title }}
- {% endif %}
-
- {% break %}
- {% endif %}
- {% endfor %}
- {% endfor %}
- {% if post.layout == 'video_post' %}
- ·
- Video
- {% endif %}
-
\ No newline at end of file
+{%- comment -%} Better for caching to not use the whole post as the cache key {%- endcomment -%}
+{%- assign categories = include.post.categories -%}
+{%- if include.post.layout == 'video_post -%}
+ {%- assign is_video = true -%}
+{%- else -%}
+ {%- assign is_video = false -%}
+{%- endif -%}
+{%- include_cached category_display_inner.html categories=categories is_video=is_video -%}
diff --git a/_includes/category_display_inner.html b/_includes/category_display_inner.html
new file mode 100644
index 0000000000..317f3d7689
--- /dev/null
+++ b/_includes/category_display_inner.html
@@ -0,0 +1,31 @@
+{%- assign categories = include.categories -%}
+{%- assign is_video = include.is_video -%}
+{%- assign read_more = include.read_more -%}
+{%- assign found_category = 'false' -%}
+
+
+ {%- for post_category in categories | downcase -%}
+ {%- if found_category == 'true' -%}
+ {%- break -%}
+ {%- endif -%}
+ {%- for category in site.data.categories -%}
+ {%- if post_category == category.title | downcase -%}
+ {%- assign found_category = 'true' -%}
+
+ {%- if read_more -%}
+ View all
+ {{- category.title -}}
+ articles
+ {%- else -%}
+ {{- category.title -}}
+ {%- endif -%}
+
+ {%- break -%}
+ {%- endif -%}
+ {%- endfor -%}
+ {%- endfor -%}
+ {%- if is_video -%}
+ ·
+ Video
+ {%- endif -%}
+
diff --git a/_includes/category_list.html b/_includes/category_list.html
index 5a5561d057..c0e65dcc01 100644
--- a/_includes/category_list.html
+++ b/_includes/category_list.html
@@ -1,13 +1,17 @@
-{% assign selectedIndex = include.selectedIndex %}
+{%- assign selectedCategory = include.selectedCategoryName -%}
-
diff --git a/_includes/category_list_compact.html b/_includes/category_list_compact.html
index 89be3eedee..fb6ca67d7f 100644
--- a/_includes/category_list_compact.html
+++ b/_includes/category_list_compact.html
@@ -1,19 +1,24 @@
-{% assign selectedIndex = include.selectedIndex %}
-Categories
--
- {% for category in site.data.categories %}
-
- - - {{ category.title }} - - - {% endfor %} -
Categories
+-
+ {%- for category in site.data.categories -%}
+
- + + + {{- category.title -}} + + + + {%- endfor -%} +
-
-
+{%- assign selectedCategory = include.selectedCategoryName -%}
+
diff --git a/_includes/email_list.html b/_includes/email_list.html
new file mode 100644
index 0000000000..5343a3d47f
--- /dev/null
+++ b/_includes/email_list.html
@@ -0,0 +1,7 @@
+
diff --git a/_includes/featured_post.html b/_includes/featured_post.html
new file mode 100644
index 0000000000..9ab550bb97
--- /dev/null
+++ b/_includes/featured_post.html
@@ -0,0 +1,78 @@
+{%- assign post = include.post -%}
+{%- assign shape = include.shape -%}
+
+
+
+{%- include category_display.html post = post -%}
+ + {{- post.title -}} + {%- include post_summary_social.html post=post -%} +
+{{- post.summary | truncatewords: 25 -}}
+
+
+ {%- comment -%} Allow shape to be overridden during include {%- endcomment -%}
+ {%- if shape == null -%}
+ {%- capture shape -%}{%- include post_shape.html post=post -%}{%- endcapture -%}
+ {%- assign shape = shape | strip -%}
+ {%- endif -%}
+ {%- case shape -%}
+ {%- when 'shape1' -%}
+
+ {%- when 'shape2' -%}
+
+ {%- when 'shape3' -%}
+
+ {%- when 'shape4' -%}
+
+ {%- else -%}
+
+ {%- endcase -%}
+ {%- if post.image and post.featuredImage -%}
+ {%- capture image-path -%}{{- site.baseurl -}}/{{-post.image-}}{%- endcapture -%}
+ 
+ {%- endif -%}
+
diff --git a/_includes/featured_posts.html b/_includes/featured_posts.html
index 8b673a21ff..fd59f49398 100644
--- a/_includes/featured_posts.html
+++ b/_includes/featured_posts.html
@@ -1,62 +1,35 @@
-{% if include.categoryName == "Latest Articles" %}
- {% assign featuredPosts = site.tags.featured %}
-{% else %}
- {% assign featuredPosts = '' | split: '' %}
- {% for post in include.postsToFilter %}
- {% if post.tags contains 'featured' %}
- {% assign featuredPosts = featuredPosts | push: post %}
- {% endif %}
- {% endfor %}
-{% endif %}
-{% assign numPosts = featuredPosts | size %}
-{% if numPosts >= 2 %}
-
- {% for post in featuredPosts limit:2 %}
-
-
diff --git a/_includes/post_colour.html b/_includes/post_colour.html
index c9aef26e54..ef62be9ca9 100644
--- a/_includes/post_colour.html
+++ b/_includes/post_colour.html
@@ -1,11 +1,19 @@
-{% if include.post.colour %}
- {{ include.post.colour }}
-{% else %}
- {% assign colourIndex = include.post.title | size | modulo:4 %}
- {% case colourIndex %}
- {% when 0 %}teal
- {% when 1 %}orange
- {% when 2 %}pink
- {% when 3 %}yellow
- {% endcase %}
-{% endif %}
+{%- if include.post.colour -%}
+ {{- include.post.colour -}}
+{%- elsif include.postIndex != nil -%}
+ {%- assign colourIndex = include.postIndex | modulo: 4 -%}
+ {%- case colourIndex -%}
+ {%- when 0 -%} teal
+ {%- when 1 -%} orange
+ {%- when 2 -%} pink
+ {%- when 3 -%} yellow
+ {%- endcase -%}
+{%- else -%}
+ {%- assign colourIndex = include.post.title | size | modulo: 4 -%}
+ {%- case colourIndex -%}
+ {%- when 0 -%} teal
+ {%- when 1 -%} orange
+ {%- when 2 -%} pink
+ {%- when 3 -%} yellow
+ {%- endcase -%}
+{%- endif -%}
\ No newline at end of file
diff --git a/_includes/post_colour_hex.html b/_includes/post_colour_hex.html
index 0517600130..e6f4fdc647 100644
--- a/_includes/post_colour_hex.html
+++ b/_includes/post_colour_hex.html
@@ -1,11 +1,15 @@
-{% if include.post.colour %}
- {{ include.post.colour }}
-{% else %}
- {% assign colourIndex = include.post.title | size | modulo:4 %}
- {% case colourIndex %}
- {% when 0 %}#2bb3bb
- {% when 1 %}#ef8547
- {% when 2 %}#c41565
- {% when 3 %}#f8be4f
- {% endcase %}
-{% endif %}
+{%- if include.post.colour -%}
+ {{- include.post.colour -}}
+{%- else -%}
+ {%- assign colourIndex = include.post.title | size | modulo: 4 -%}
+ {%- case colourIndex -%}
+ {%- when 0 -%}
+ #2bb3bb
+ {%- when 1 -%}
+ #ef8547
+ {%- when 2 -%}
+ #c41565
+ {%- when 3 -%}
+ #f8be4f
+ {%- endcase -%}
+{%- endif -%}
diff --git a/_includes/post_index.html b/_includes/post_index.html
index ad52b44bbe..d5f86fc912 100644
--- a/_includes/post_index.html
+++ b/_includes/post_index.html
@@ -1,34 +1,52 @@
-{% assign allPosts = include.posts %}
-{% assign categoryName = include.categoryName %}
-{% for category in site.data.categories %}
- {% if categoryName == category.title %}
- {% assign categoryIndex = forloop.index0 %}
- {% endif %}
-{% endfor %}
-{% if include.paginated %}
- {% assign paginated = include.paginated %}
-{% else %}
- {% assign paginated = false %}
-{% endif %}
+{%- assign allPosts = paginator.posts -%}
+{%- if page.pagination.category -%}
+ {%- assign categoryName = page.pagination.category -%}
+{%- elsif page.pagination.tag == 'video_post' -%}
+ {%- assign categoryName = 'Videos' -%}
+{%- else -%}
+ {%- assign categoryName = 'Latest Articles' -%}
+{%- endif -%}
+{%- if categoryName == 'Latest Articles' -%}
+ {%- assign fullWidth = false -%}
+{%- else -%}
+ {%- assign fullWidth = true -%}
+{%- endif -%}
-
- {% include category_display.html post = post %}
- - {{ post.title }} - {% include post_summary_social.html post=post %} -
-{{ post.summary }}
-
-
- {% capture shape %}{% include post_shape.html post=post %}{% endcapture %}
- {% assign shape = shape | strip %}
- {% case shape %}
- {% when "shape1" %}
-
- {% when "shape2" %}
-
- {% when "shape3" %}
-
- {% when "shape4" %}
-
- {% else %}
-
- {% endcase %}
- {% if post.image and post.featuredImage %}
- {% capture image-path %}{{ site.baseurl }}/{{post.image}}{% endcapture %}
- 
- {% endif %}
+{%- if include.categoryName == 'Latest Articles' -%}
+ {%- assign featuredPosts = site.tags.featured -%}
+{%- else -%}
+ {%- assign featuredPosts = '' | split: '' -%}
+ {%- assign toFilter = site.categories[include.categoryName] %}
+ {%- for post in toFilter -%}
+ {%- if post.tags contains 'featured' -%}
+ {%- assign featuredPosts = featuredPosts | push: post -%}
+ {%- endif -%}
+ {%- endfor -%}
+{%- endif -%}
+{%- assign numPosts = featuredPosts | size -%}
+{%- if numPosts > 0 -%}
+
-{% endif %}
+{%- endif -%}
diff --git a/_includes/format_date.html b/_includes/format_date.html
index 6324a0e993..2a8f9891bf 100644
--- a/_includes/format_date.html
+++ b/_includes/format_date.html
@@ -1,15 +1,23 @@
-{% assign date = include.date | date: "%s" %}
-{% assign days = date | date: "%-d" %}
-{% case days %}
- {% when "1" or "21" or "31" %}{{ days }}st
- {% when "2" or "22" %}{{ days }}nd
- {% when "3" or "23" %}{{ days }}rd
- {% else %}{{ days }}th
-{% endcase %}
-{% assign year = date | date: "%Y" %}
-{% assign currentYear = 'now' | date: "%Y" %}
-{% if year == currentYear %}
- {{ date | date: "%b" }}
-{% else %}
- {{ date | date: "%b %Y" }}
-{% endif %}
+{%- assign date = include.date | date: '%s' -%}
+{%- assign days = date | date: '%-d' -%}
+{%- case days -%}
+ {%- when '1', '21', '31' -%}
+ {{- days -}}
+ st
+ {%- when '2', '22' -%}
+ {{- days -}}
+ nd
+ {%- when '3', '23' -%}
+ {{- days -}}
+ rd
+ {%- else -%}
+ {{- days -}}
+ th
+{%- endcase -%}
+{%- assign year = date | date: '%Y' -%}
+{%- assign currentYear = 'now' | date: '%Y' -%}
+{%- if year == currentYear -%}
+ {{- date | date: '%b' -}}
+{%- else -%}
+ {{- date | date: '%b %Y' -}}
+{%- endif -%}
diff --git a/_includes/pagination.html b/_includes/pagination.html
index f511852524..5bbf617b59 100644
--- a/_includes/pagination.html
+++ b/_includes/pagination.html
@@ -1,3 +1,57 @@
+ {%- assign topPost = featuredPosts[0] -%}
+ {% assign randIdx = "now" | date: "%N" | modulo: 4 %}
+
- {% endfor %}
-
+ {%- include featured_post.html post=topPost -%}
+
+ {%- if numPosts >= 3 -%}
+ {%- assign splitPosts = featuredPosts | slice: 1, 2 -%}
+ {%- for post in splitPosts -%}
+ {%- assign colourIndex = randIdx | plus: forloop.index -%}
+
+ {%- include featured_post.html post=post -%}
+
+ {%- endfor -%}
+ {%- endif -%}
- Next »
-
\ No newline at end of file
+ -
+ {%- assign min_offset = 4 -%}
+ {%- if paginator.previous_page -%}
+
- + ← Previous + + {%- else -%} +
- ← Previous + {%- endif -%} + {%- if paginator.page > min_offset -%} +
- + {{- paginator.first_page -}} + +
- ... + {%- elsif paginator.page == min_offset -%} +
- + {{- paginator.first_page -}} + + {%- endif -%} + {%- if paginator.page_trail -%} + {% for trail in paginator.page_trail %} + {%- if page.url == trail.path -%} + {%- assign class = 'current' -%} + {%- else -%} + {%- assign class = '' -%} + {%- endif -%} +
- + + {{- trail.num -}} + + + {% endfor %} + {%- endif -%} + {%- assign limit = paginator.total_pages | minus: min_offset | plus: 1 -%} + {%- if paginator.page < limit -%} +
- ... +
- + {{- paginator.last_page -}} + + {%- elsif paginator.page == limit -%} +
- + {{- paginator.last_page -}} + + {%- endif -%} + {%- if paginator.next_page -%} +
- + Next → + + {%- else -%} +
- Next → + {%- endif -%} +
- {% if categoryName == "Latest Articles" %}
-
+
+
+
Blog
-Our thoughts on technology and design
+ {% if categoryName == 'Latest Articles' %} +Blog
+Our thoughts on technology and design
{% else %} -Blog
-{{ categoryName }}
+
+
+
+
+ chevron_left
+
+ Blog
+
+
+
+
+ chevron_left
+
+ Blog
+ {{ categoryName }}
{% endif %} - - {% include featured_posts.html postsToFilter=allPosts categoryName=categoryName %} -
-
- {% include post_summary_list.html posts=allPosts paginated=paginated %}
+
+
+
-{% include site-footer.html %}
+{%- include site-footer.html -%}
diff --git a/_includes/post_metadata.html b/_includes/post_metadata.html
index b3da2189fe..e264d072c7 100644
--- a/_includes/post_metadata.html
+++ b/_includes/post_metadata.html
@@ -1,18 +1,19 @@
-{% assign post = include.post %}
-{% assign allContributors = post.contributors | join: '|' | prepend: '|' | prepend: post.author | split: '|' %}
+{%- assign post = include.post -%}
+{%- assign allContributors = post.contributors | join: '|' | prepend: '|' | prepend: post.author | split: '|' -%}
+ {%- if paginator.page < 2 -%}
+ {%- include_cached featured_posts.html categoryName=categoryName -%}
+ {%- endif -%}
+ {%- include post_summary_list.html fullWidth=fullWidth -%}
-
- {% include category_list.html selectedIndex=categoryIndex %}
- {% include author_list.html %}
+
+ {%- comment -%}{%- include search.html categoryName=categoryName -%}{%- endcomment -%}
+ {%- include_cached category_list.html selectedCategoryName=categoryName -%}
+ {%- include_cached author_list.html -%}
+ {%- comment -%}{%- include email_list.html -%}{%- endcomment -%}
- {% for contributorId in allContributors %}
- {% assign contributor = site.data.authors.authors[contributorId] %}
- {{ contributor.name }}{% unless forloop.last %}, {% endunless %}
- {% endfor %}
- ·
+ {%- for contributorId in allContributors -%}
+ {%- assign contributor = site.data.authors.authors[contributorId] -%}
+ {{- contributor.name | replace: ' ', ' ' -}}
+ {%- unless forloop.last %}, {% endunless -%}
+ {%- endfor -%}
-
diff --git a/_includes/post_shape.html b/_includes/post_shape.html
index b3ea64c32f..d560ceffbd 100644
--- a/_includes/post_shape.html
+++ b/_includes/post_shape.html
@@ -1,5 +1,6 @@
-{% if include.post.header-shape %}
- {{ include.post.header-shape }}
-{% else %}
- shape{{ include.post.title | size | modulo:5 }}
-{% endif %}
+{%- if include.post['header-shape'] -%}
+ {{- include.post['header-shape'] -}}
+{%- else -%}
+ shape
+ {{- include.post.title | size | modulo: 5 -}}
+{%- endif -%}
diff --git a/_includes/post_summary.html b/_includes/post_summary.html
index 63c1cc1534..ddf134af62 100644
--- a/_includes/post_summary.html
+++ b/_includes/post_summary.html
@@ -1,25 +1,37 @@
-{% assign post = include.post %}
-{% assign hideCategory = include.hideCategory %}
-{% assign author = site.data.authors.authors[post.author] %}
-
-
- {% unless hideCategory %}
- {% include category_display.html post = post %}
- {% endunless %}
-
- {{ post.title }}
- {% include post_summary_social.html post=post %}
-
-
- {% if post.summary %}
- {{ post.summary }}
- {% else %}
- {{ post.content | strip_html | truncatewords:50 }}
- {% endif %}
-
-
+{%- assign post = include.post -%}
+{%- assign postIndex = include.postIndex -%}
+{%- assign hideCategory = include.hideCategory -%}
+{%- assign author = site.data.authors.authors[post.author] -%}
+{%- if include.fullWidth -%}
+ {%- assign largeClass = 'large-12' -%}
+{%- else -%}
+ {%- assign largeClass = 'large-6' -%}
+{%- endif -%}
+
+
diff --git a/_includes/post_summary_list.html b/_includes/post_summary_list.html
index a107fb6c49..ea43e8fd2f 100644
--- a/_includes/post_summary_list.html
+++ b/_includes/post_summary_list.html
@@ -1,15 +1,25 @@
-{% assign posts = include.posts %}
-{% assign paginated = include.paginated %}
-{% assign hideCategory = include.hideCategory %}
-
+ {%- unless hideCategory -%}
+ {%- include category_display.html post = post -%}
+ {%- endunless -%}
+
+ {{- post.title -}}
+ {%- include post_summary_social.html post=post -%}
+
+ {%- if post.summary -%}
+ {{- post.summary | truncatewords: 50 -}}
+ {%- else -%}
+ {{- post.content | strip_html | truncatewords: 50 -}}
+ {%- endif -%}
+
+
+
- {% comment %} This container is used by jScroll. When the next page is fetched, the contents of this div are added to the bottom of the page {% endcomment %}
-
- {% for post in posts %}
- {% include post_summary.html post=post hideCategory=hideCategory %}
- {% endfor %}
-
- {% if paginated %}
- {% include pagination.html %}
- {% endif %}
-
+{%- assign hideCategory = include.hideCategory -%}
+{%- assign fullWidth = include.fullWidth -%}
+{%- if include.posts != null -%}
+ {%- assign posts = include.posts -%}
+ {%- assign paginated = false -%}
+{%- else -%}
+ {%- assign posts = paginator.posts -%}
+ {%- assign paginated = posts -%}
+{%- endif -%}
+
+
diff --git a/_includes/post_summary_social.html b/_includes/post_summary_social.html
index f65bb5dccd..613a90607b 100644
--- a/_includes/post_summary_social.html
+++ b/_includes/post_summary_social.html
@@ -1,10 +1,19 @@
-{% capture url %}{{ site.canonical.url }}{{ post.url }}{% endcapture %}
+{%- capture url -%}{{- site.canonical.url -}}{{- post.url -}}{%- endcapture -%}
+ {%- for post in posts -%}
+ {%-
+ include post_summary.html
+ post=post
+ postIndex=forloop.index0
+ hideCategory=hideCategory
+ fullWidth=fullWidth
+ -%}
+ {%- endfor -%}
+ {%- if paginated -%}
+ {%- include pagination.html -%}
+ {%- endif -%}
+