Program include update (#316)

* program update * correct room names --------- Co-authored-by: dc <dc@dcwalker.ca>
ournetworks · Jul 15, 2024 · 6a33f9a · 6a33f9a
1 parent e9977e3
commit 6a33f9a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 21 deletions.
diff --git a/_data/sessions.yml b/_data/sessions.yml
@@ -1613,7 +1613,7 @@
       Local-First software (“LoFi”) is an approach to software that boasts many advantages over the cloud, from enhanced privacy to improved collaboration without relying on the network or a specific host. This promises more user agency, lowers barriers to entry, and adds new degrees of freedom, but comes with new constraints and challenges. In this talk, Brooklyn will explore the state of LoFi today, what we can learn from its successes, and what comes next.
 
   - sessionID: 24004
-    title: 
+    title: "Repair Futures"
     presenterID:
       - michelle
     sessionType: discussion

diff --git a/_includes/presenter-details.html b/_includes/presenter-details.html
@@ -1,8 +1,8 @@
 {%- if presenter.name -%}
-<div class="presenter program-block">
+<div class="highlight program-block">
   <div class="program-block-content p-1" id="{{ presenter.presenterID }}">
     <header class="leading-relaxed">
-      <h3 class="presenter-name heading mb-0 text-base">{{ presenter.name }}</h3>
+      <h3 class="highlight-name heading mb-0 text-base">{{ presenter.name }}</h3>
       {%- if presenter.affiliation -%}
       <h4 class="mt-0 font-normal text-sm mb-1">{{ presenter.affiliation}}</h4>
       {%-endif -%}

diff --git a/_includes/session-details.html b/_includes/session-details.html
@@ -1,8 +1,8 @@
 {%- if session.title -%}
-<div class="session-detail">
+<div class="session-detail highlight">
   <div class="program-block-content p-1" {% unless session.skipProgramID %}id="{{ session.title | slugify }}"{% endunless %}>
     <header class="session-header mb-1">
-      <h3 class="session-title heading font-display">{{ session.title }}</h3>
+      <h3 class="session-title heading font-display highlight-name">{{ session.title }}</h3>
       {%- if session.presenterID -%}
           {% assign presenters = site.data.presenters[include.year] %}
           {% assign presenterCount = session.presenterID.size %}

diff --git a/_includes/session.html b/_includes/session.html
@@ -1,12 +1,11 @@
 {%- for session in site.data.sessions[include.year] -%}
   {%- if include.session-id == session.sessionID -%}
   <div class="session">
-    <header>
-      <h3 class="session-title font-display">
-        {{ session.title }}
+      <h3 class="text-base m-0 font-normal">
+        <a href="#{{ session.title | slugify }}">{{ session.title }}</a>
       </h3>
       {% if session.presenterID %}
-        <h4 class="session-presenterID mt-05">
+        <a href="#{{ session.presenterID }}" class="session-presenterID text-base m-0 font-normal">
           {% assign presenters = site.data.presenters[include.year] %}
           {% assign presenterCount = session.presenterID.size %}
           {%- for presenterID in session.presenterID -%}
@@ -18,9 +17,8 @@ <h4 class="session-presenterID mt-05">
             {% assign presenterCount = presenterCount | minus:1 %}
             {{ name }}<br>
           {%- endfor -%}
-        </h4>
+        </a>
       {% endif %}
-    </header>
   </div>
   {%- endif -%}
 {%- endfor -%}
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
@@ -228,8 +228,8 @@
   margin-bottom: -4px;
 }
 
-.presenter:has(*:target) {
-  .presenter-name:before {
+.highlight:has(*:target) {
+  .highlight-name:before {
     margin-right: 1ch;
     margin-left: -2ch;
     content: "*";

diff --git a/program.md b/program.md
@@ -23,7 +23,11 @@ titleDisplay: "Program"
     </tr>
     <tr>
         <td class="font-mono text time-cell">10:20 ↓<br />11:00</td>
-        <td><strong><span class="font-mono">PAST</span> / <a href="#lori">Lori Emerson</a></strong>
+        <td>
+            <strong>
+                <span class="font-mono">PAST</span> /
+            </strong>
+            {% include session.html year=2024 session-id=24001 %}
         </td>
     </tr>
     <tr>
@@ -32,10 +36,11 @@ titleDisplay: "Program"
             <strong><span class="font-mono">PAST</span> / </strong>
             <table class="w-100">
                 <tr class="border-0">
+                    <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Reach</em><br />Workshop -<br />
+                    {% include session.html year=2024 session-id=24002 %}</td>
                     <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Sound</em><br />
                             LAN Interaction
                     </td>
-                    <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Reach</em><br />Workshop -<br /> Tiny Dreams: Ecomedia and Small File Web Art <br /> <a href="#joni">Joni Schinkel</a></td>
                     <!--<td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Spillover</em><br />Open</td>-->
                 </tr>
             </table>
@@ -47,15 +52,18 @@ titleDisplay: "Program"
     </tr>
     <tr>
         <td class="font-mono text time-cell">13:30 ↓<br />14:10</td>
-        <td><strong><span class="font-mono">PRESENT</span> / <a href="#brooklyn">Brooklyn Zelenka</a> </strong></td>
+        <td>
+            <strong><span class="font-mono">PRESENT</span></strong> /
+            {% include session.html year=2024 session-id=24003 %}
+        </td>
     </tr>
     <tr>
         <td class="font-mono text time-cell">14:10 ↓<br />15:00</td>
         <td>
             <strong><span class="font-mono">PRESENT</span> / </strong>
             <table class="w-100">
                 <tr class="border-0">
-                    <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Sound & ⌂ Reach</em><br />
+                    <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Reach & ⌂ Sound</em><br />
                         <strong>Lightning Talks</strong>
                     </td>
                     <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Spillover</em><br />Open</td>
@@ -77,8 +85,11 @@ titleDisplay: "Program"
             <strong><span class="font-mono">FUTURE</span> / </strong>
             <table class="w-100">
                 <tr class="border-0">
-                    <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Sound</em><br />Roundtable -<br /> Repair Futures <a href="#michelle">Michelle Kaczmarek</a></td>
-                    <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Reach</em><br />Open</td>
+                    <td>
+                        <em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Reach</em><br />Roundtable -<br />
+                        {% include session.html year=2024 session-id=24004 %}
+                    </td>
+                    <td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Sound</em><br />Open</td>
                     <!--<td><em class="font-display-mono uppercase text-sm whitespace-nowrap not-italic tracking-wide">⌂ Spillover</em><br />Open</td>-->
                 </tr>
             </table>
@@ -98,8 +109,9 @@ titleDisplay: "Program"
     </tr>
 </table>
 
----
-{:.mt-2}
+<pre role="img" aria-label="ASCII divider" class="font-display-mono aliased text-10 inline-flex max-w-prose overflow-hidden w-100">
+--..,___.--,--'`,---..-.--+--.,,-,,..._.--..-._.-a:f--..-.--
+</pre>
 
 {:.font-display}
 
@@ -122,6 +134,10 @@ titleDisplay: "Program"
   {% include session-details.html year=2024 %}
 {% endfor %}
 
+<pre role="img" aria-label="ASCII divider" class="font-display-mono aliased text-10 inline-flex max-w-prose overflow-hidden w-100">
+.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*
+</pre>
+
 {:.font-display}
 
 ## Presenters