Merge pull request #610 from oddbird/feature-layout

Add featured workshop to home & css/_talk/oss pages

content/_includes/page/base.njk

@@ -32,6 +32,16 @@
     </div>
   {%- endif %}
 
+  {%- set show_workshop = feature_workshop or (tags and (('CSS' in tags) or ('_talk' in tags))) or oss -%}
+  {%- set fw = collections._talk | findPage('data.feature', 'workshop') -%}
+  {%- set is_workshop = page.url == fw.url -%}
+  {%- if fw and show_workshop and not is_workshop -%}
+    <section data-typeset>
+      {% import "page/workshop.macros.njk" as workshop %}
+      {{ workshop.feature(fw) }}
+    </section>
+  {%- endif -%}
+
   {% include 'page/mentions.njk' %}
 
   {% if oss or sponsors %}

content/_includes/page/workshop.macros.njk

@@ -0,0 +1,26 @@
+{% import 'utility.macros.njk' as utility %}
+{% import 'layout.macros.njk' as layout %}
+{% import 'post.macros.njk' as post %}
+
+{% macro feature(page) %}
+  {{ layout.title('Upcoming Workshop') }}
+  <article {{ post.aria_label(page) }} class="feature-workshop">
+    {{ post.hero(page.data.image, 'post') }}
+    <header class="training-header">
+      {{ post.banner(page) }}
+      {{ post.subtitle(page.data.sub) }}
+      {{ post.byline(page, collections) }}
+    </header>
+
+    <div class="training-detail">
+      {{ page.data.summary | md | safe }}
+
+      {% if page.data.action %}
+        {{ utility.main_action(
+          page.data.action.text,
+          url=page.data.action.url
+        ) }}
+      {% endif %}
+    </div>
+  </article>
+{% endmacro %}

content/index.njk

@@ -48,6 +48,12 @@ tools:
 {{ embed.logos(work, collections.all) }}
 {{ layout.section_link('View work samples', '/work/') }}
 
+{% set fw = collections._talk | findPage('data.feature', 'workshop') %}
+{% if fw %}
+  {% import "page/workshop.macros.njk" as workshop %}
+  {{ workshop.feature(fw) }}
+{% endif %}
+
 {{ post.homepage_posts(
    collections,
    class='preview'

content/services/index.njk

@@ -1,4 +1,5 @@
 ---
+feature_workshop: true
 title: Services
 banner: OddBird's Services
 services:

content/talks.njk

@@ -24,26 +24,8 @@ summary: |
 
 {% set fw = collections._talk | findPage('data.feature', 'workshop') %}
 {% if fw %}
-  {{ layout.title('Upcoming Workshop') }}
-  <article {{ post.aria_label(item) }} class="feature-workshop">
-    {{ post.hero(fw.data.image, 'post') }}
-    <header class="training-header">
-      {{ post.banner(fw) }}
-      {{ post.subtitle(fw.data.sub) }}
-      {{ post.byline(fw, collections) }}
-    </header>
-
-    <div class="training-detail">
-      {{ fw.data.summary | md | safe }}
-
-      {% if fw.data.action %}
-        {{ utility.main_action(
-          fw.data.action.text,
-          url=fw.data.action.url
-        ) }}
-      {% endif %}
-    </div>
-  </article>
+  {% import "page/workshop.macros.njk" as workshop %}
+  {{ workshop.feature(fw) }}
 {% endif %}
 
 {{ quotes.find(