From 7e1a4f84a491090cf8752073ccf0845dd4272231 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Tue, 5 Dec 2023 17:48:43 +0000 Subject: [PATCH 1/3] More descriptive names for nav landmarks --- _includes/site-header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/site-header.html b/_includes/site-header.html index 8128c93b37..2de0fc0b58 100644 --- a/_includes/site-header.html +++ b/_includes/site-header.html @@ -37,7 +37,7 @@

Scott Logic / Altogether Sma
-
-
-
\ No newline at end of file + diff --git a/_includes/recruitment.html b/_includes/recruitment.html index 482de0c4c6..ae15b10a7c 100644 --- a/_includes/recruitment.html +++ b/_includes/recruitment.html @@ -21,10 +21,10 @@ {% endif %} {% endcapture %} -
+
\ No newline at end of file + diff --git a/_includes/watch_more.html b/_includes/watch_more.html index 6c930c1dc3..f79a757186 100644 --- a/_includes/watch_more.html +++ b/_includes/watch_more.html @@ -1,12 +1,11 @@ - -
+
- \ No newline at end of file + + diff --git a/_layouts/default_post.html b/_layouts/default_post.html index 0d92e59043..05bcbb3ef4 100644 --- a/_layouts/default_post.html +++ b/_layouts/default_post.html @@ -90,16 +90,18 @@

{{ page.title }}

{{ content }}
- + {% if site.data.related contains post.url %} - {% include read_more.html author=author authorUsername=authorUsername page=page %} - {% assign related = site.data.related[post.url] %} - {% assign posts = site.posts | where_exp:"item", "item.url == related[0]" %} - {% include post_summary_list.html posts=posts hideCategory=true %} - {% assign posts = site.posts | where_exp:"item", "item.url == related[1]" %} - {% include post_summary_list.html posts=posts hideCategory=true %} + {% endif %} - + {% include recruitment.html page=page %}
diff --git a/_layouts/video_post.html b/_layouts/video_post.html index 06d6760c07..923842879c 100644 --- a/_layouts/video_post.html +++ b/_layouts/video_post.html @@ -71,13 +71,15 @@

{{ page.title }}

{% include social.html %} +
{{ content }}
- {% include watch_more.html %} + {% include watch_more.html %}
+
{% include author_summary.html author-id=page.author %} {% for contributorId in page.contributors %} From 5c74cbf4d6c0f9656d06a5341dda9b22997ecf0b Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Wed, 6 Dec 2023 11:40:06 +0000 Subject: [PATCH 3/3] Uses main landmarks --- 404.html | 4 +- _includes/post_index.html | 4 +- _layouts/default_author.html | 5 +- _layouts/default_post.html | 208 ++++++++++++++++++----------------- _layouts/video_post.html | 156 +++++++++++++------------- category/sustainability.html | 2 +- category/videos.html | 2 +- 7 files changed, 193 insertions(+), 188 deletions(-) diff --git a/404.html b/404.html index bdf5fbeb37..1123581293 100644 --- a/404.html +++ b/404.html @@ -4,7 +4,7 @@ paginated: false --- -
+

Sorry you've not found what you're looking for.

@@ -13,4 +13,4 @@

Sorry you've not found what you're looking for.

Head back to our Homepage or Blog and you'll find simple paths to all our most interesting content.

-
+ diff --git a/_includes/post_index.html b/_includes/post_index.html index ad52b44bbe..302e8cdc60 100644 --- a/_includes/post_index.html +++ b/_includes/post_index.html @@ -10,7 +10,7 @@ {% else %} {% assign paginated = false %} {% endif %} -
+
{% if categoryName == "Latest Articles" %}

Blog

Our thoughts on technology and design

@@ -29,6 +29,6 @@

{{ categoryName }}

{% include author_list.html %}
- + {% include site-footer.html %} diff --git a/_layouts/default_author.html b/_layouts/default_author.html index bf0591fa17..7e4cc90f38 100644 --- a/_layouts/default_author.html +++ b/_layouts/default_author.html @@ -21,7 +21,7 @@ {% endfor %} {% assign allEvents = allEvents | sort: 'eventDate' | reverse | uniq %} -
+
{% include author.html author=author %} @@ -48,5 +48,6 @@

Talks

- + + {% include site-footer.html %} diff --git a/_layouts/default_post.html b/_layouts/default_post.html index 05bcbb3ef4..8d0497058f 100644 --- a/_layouts/default_post.html +++ b/_layouts/default_post.html @@ -4,117 +4,119 @@ {% assign author = site.data.authors.authors[page.author] %} {% assign authorUsername = page.author %} -
-
-
-
- {% include category_display.html post = page %} - · - {{ page.date | date: "%d %B %Y" }} - · - {% include reading_time.html post=post %} -
-
-

{{ page.title }}

+
+
+
+
+
+ {% include category_display.html post = page %} + · + {{ page.date | date: "%d %B %Y" }} + · + {% include reading_time.html post=post %} +
+
+

{{ page.title }}

+
+ {% if page.cta %} +
+ → {{ page.cta.text }} +
+ {% endif %} + {% if page.canonical_url %} + + {% else %} + + {% endif %}
- {% if page.cta %} -
- → {{ page.cta.text }} +
+ {% capture shape %}{% include post_shape.html post=page %}{% endcapture %} + {% assign shape = shape | strip %} + {% case shape %} + {% when "shape1" %} + + + + + + + + {% when "shape2" %} + + + + + + + + {% when "shape3" %} + + + + + + + + {% when "shape4" %} + + + + + + + {% else %} + + + + + + + + {% endcase %}
- {% endif %} - {% if page.canonical_url %} - - {% else %} - - {% endif %} -
-
- {% capture shape %}{% include post_shape.html post=page %}{% endcapture %} - {% assign shape = shape | strip %} - {% case shape %} - {% when "shape1" %} - - - - - - - - {% when "shape2" %} - - - - - - - - {% when "shape3" %} - - - - - - - - {% when "shape4" %} - - - - - - - {% else %} - - - - - - - - {% endcase %}
-
-
-
-
- {% include author_picture.html %} - {% - for contributorId in page.contributors %}, - {% include author-link.html author-id=contributorId %} - {% endfor %} -
- {% include social.html %} -
-
-
- {{ content }} +
+
+
+ {% include author_picture.html %} + {% + for contributorId in page.contributors %}, + {% include author-link.html author-id=contributorId %} + {% endfor %} +
+ {% include social.html %}
+
+
+ {{ content }} +
- {% if site.data.related contains post.url %} - - {% endif %} + {% if site.data.related contains post.url %} + + {% endif %} - {% include recruitment.html page=page %} -
-
- {% include author_summary.html author-id=page.author %} - {% for contributorId in page.contributors %} - {% include author_summary.html author-id=contributorId %} - {% endfor %} - {% include category_list.html selectedIndex=0 %} -
- Back to all posts + {% include recruitment.html page=page %} +
+
+ {% include author_summary.html author-id=page.author %} + {% for contributorId in page.contributors %} + {% include author_summary.html author-id=contributorId %} + {% endfor %} + {% include category_list.html selectedIndex=0 %} +
+ Back to all posts +
-
-
+
+
{% include site-footer.html %} diff --git a/_layouts/video_post.html b/_layouts/video_post.html index 923842879c..c707fdab82 100644 --- a/_layouts/video_post.html +++ b/_layouts/video_post.html @@ -4,93 +4,95 @@ {% assign author = site.data.authors.authors[page.author] %} {% assign authorUsername = page.author %} -
-
-
-
- {% include category_display.html post = page %} - · - {{ page.date | date: "%d %B %Y" }} +
+
+
+
+
+ {% include category_display.html post = page %} + · + {{ page.date | date: "%d %B %Y" }} +
+
+

{{ page.title }}

+
+ {% if page.cta %} +
+ → {{ page.cta.text }} +
+ {% endif %}
-
-

{{ page.title }}

+
+ {% capture shape %}{% include post_shape.html post=page %}{% endcapture %} + {% case shape %} + {% when "shape2" %} + + + + + + + + {% when "shape3" %} + + + + + + + + {% when "shape4" %} + + + + + + + + {% else %} + + + + + + + + {% endcase %}
- {% if page.cta %} -
- → {{ page.cta.text }} +
+
- {% endif %}
-
- {% capture shape %}{% include post_shape.html post=page %}{% endcapture %} - {% case shape %} - {% when "shape2" %} - - - - - - - - {% when "shape3" %} - - - - - - - - {% when "shape4" %} - - - - - - - - {% else %} - - - - - - - - {% endcase %} -
-
- -
-
-
-
-
- {% include author_picture.html %} - +
+
+
+ {% include author_picture.html %} + +
+ {% include social.html %}
- {% include social.html %} -
-
-
- {{ content }} -
+
+
+ {{ content }} +
- {% include watch_more.html %} -
+ {% include watch_more.html %} +
-
- {% include author_summary.html author-id=page.author %} - {% for contributorId in page.contributors %} - {% include author_summary.html author-id=contributorId %} - {% endfor %} - {% include category_list.html selectedIndex=0 %} -
- Back to all posts +
+ {% include author_summary.html author-id=page.author %} + {% for contributorId in page.contributors %} + {% include author_summary.html author-id=contributorId %} + {% endfor %} + {% include category_list.html selectedIndex=0 %} +
+ Back to all posts +
-
-
+
+
{% include site-footer.html %} diff --git a/category/sustainability.html b/category/sustainability.html index 3088c02ce5..b9759a35ae 100644 --- a/category/sustainability.html +++ b/category/sustainability.html @@ -9,4 +9,4 @@ {% if posts %} {% assign posts = posts | sort: 'date' | reverse | uniq %} {% endif %} -{% include post_index.html posts=posts categoryName="Sustainability" %} \ No newline at end of file +{% include post_index.html posts=posts categoryName="Sustainability" %} diff --git a/category/videos.html b/category/videos.html index 796b57c138..d0a2ccaef2 100644 --- a/category/videos.html +++ b/category/videos.html @@ -10,4 +10,4 @@ {% assign posts = posts | push: post %} {% endif %} {% endfor %} -{% include post_index.html posts=posts categoryName="Videos" %} \ No newline at end of file +{% include post_index.html posts=posts categoryName="Videos" %}