2024 Program (#303)

* add program * updates * Update _data/sessions.yml Co-authored-by: dcwalk <dcwalk@users.noreply.github.com> * Update program.md Co-authored-by: dcwalk <dcwalk@users.noreply.github.com> * Update program.md Co-authored-by: dcwalk <dcwalk@users.noreply.github.com> * Update program.md Co-authored-by: dcwalk <dcwalk@users.noreply.github.com> * updates * bump by 30 * updates to program --------- Co-authored-by: dcwalk <dcwalk@users.noreply.github.com> Co-authored-by: dc <dc@dcwalker.ca>
ournetworks · Jun 28, 2024 · 84a94e9 · 84a94e9
1 parent 967f8d5
commit 84a94e9
Show file tree

Hide file tree

Showing 15 changed files with 359 additions and 41 deletions.
diff --git a/_data/presenters.yml b/_data/presenters.yml
@@ -919,7 +919,7 @@
     socialMedia:
       - url: https://instagram.com/funwithgod
         text: "@funwithgod"
-      - url: http://instagram.com/smallfile
+      - url: https://www.instagram.com/smallfile
         text: "@smallfile"
 
   - presenterID: brooklyn
@@ -944,3 +944,10 @@
     link:
       - url: https://www.sharereuserepair.org/
         text: "sharereuserepair.org"
+
+  - presenterID: esther
+    name: "Esther Jang"
+    affiliation: "Seattle Community Network"
+    link:
+      - url: https://seattlecommunitynetwork.org/
+        text: "seattlecommunitynetwork.org"
diff --git a/_data/sessions.yml b/_data/sessions.yml
@@ -1585,3 +1585,36 @@
   sessionType:
     - exhibit
   sessionLink: "https://open-weather.community/"
+
+2024:
+  - sessionID: 24001
+    title: 
+    presenterID:
+      - lori
+    sessionType: talk
+    description: >
+      
+
+  - sessionID: 24002
+    title: 
+    presenterID:
+      - joni
+    sessionType: workshop
+    description: >
+      
+
+  - sessionID: 24003
+    title: 
+    presenterID:
+      - brooklyn
+    sessionType: talk
+    description: >
+      
+
+  - sessionID: 24004
+    title: 
+    presenterID:
+      - michelle
+    sessionType: discussion
+    description: >
+      
diff --git a/_includes/presenter-details.html b/_includes/presenter-details.html
@@ -1,16 +1,37 @@
 {%- if presenter.name -%}
-<li>
-  {%- if presenter.link -%}
-  <a href="{{ presenter.link[0]['url'] }}" target="_blank" rel="noopener">
+<div class="presenter 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>
+      {%- if presenter.affiliation -%}
+      <h4 class="mt-0 font-normal text-sm mb-1">{{ presenter.affiliation}}</h4>
+      {%-endif -%}
+      {%- if presenter.socialMedia -%}
+        <div class="mb-1">
+          {%for link in presenter.socialMedia%}
+            <a href="{{link.url}}" target="_blank">{{link.text}}</a>{% if forloop.last %}{% else %}, {% endif %}
+          {% endfor %}
+        </div>
+      {%- endif -%}
+    </header>
+    {%- if presenter.bio -%}
+    <div class="presenter-bio">
+      <p>{{ presenter.bio }}</p>
+    </div>
     {%- endif -%}
-    <strong>{{ presenter.name }}</strong>
-  {%- if presenter.link -%}</a>{%- endif -%}
-  {%- if presenter.affiliation -%}, {{ presenter.affiliation}}{%-endif -%}
-
-  <p class="mt-0">
-    {%- for link in presenter.link -%}
-      <a href="{{link.url}}" target="_blank">{{link.text}}</a>{% unless forloop.last %}, {% endunless %}
-    {%- endfor -%}
-  </p>
-</li>
+    <div class="presenter-links flex gap-4">
+      {%- if presenter.link -%}
+      <div>
+        <ul class="list-none pl-0 mt-0">
+          {%- for link in presenter.link -%}
+          <li class="bio-sm-list-item">
+            <a href="{{link.url}}" target="_blank">{{link.text}}</a>
+          </li>
+          {%- endfor -%}
+        </ul>
+      </div>
+      {%- endif -%}
+    </div>
+  </div>
+</div>
 {%- endif -%}
diff --git a/_includes/session-details.html b/_includes/session-details.html
@@ -0,0 +1,29 @@
+{%- if session.title -%}
+<div class="session-detail">
+  <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>
+      {%- if session.presenterID -%}
+          {% assign presenters = site.data.presenters[include.year] %}
+          {% assign presenterCount = session.presenterID.size %}
+          <ul class="list-none pl-0 mt-0">
+          {%- for presenterID in session.presenterID -%}
+            {%- for presenter in presenters -%}
+              {%- if presenter.presenterID == presenterID -%}
+                {% assign name = presenter.name %}
+              {%- endif -%}
+            {%- endfor -%}
+            {% assign presenterCount = presenterCount | minus:1 %}
+            <li><h4 class="session-presenter m-0"><a href="#{{ presenterID }}">{{ name }}</a></h4></li>
+          {%- endfor -%}
+          </ul>
+      {%- endif -%}
+    </header>
+    {%- if session.description -%}
+    <div class="session-caption">
+        <p>{{ session.description | escape | newline_to_br | truncatewords: 75 }}{%- if session.descriptionLink -%}<span class="read-more"><a href="{{ session.descriptionLink }}" rel="noopener"> read more</a></span>{%- endif -%}</p>
+    </div>
+    {%- endif -%}
+  </div>
+</div>
+{%- endif -%}
diff --git a/_includes/session-type.html b/_includes/session-type.html
@@ -0,0 +1,4 @@
+{%- for session in site.data.sessions -%}
+  {%- assign sessionObject = session[1] | where: "sessionID", include.session-id | first -%}
+  {{ sessionObject.sessionType }}
+{%- endfor -%}
diff --git a/_includes/session.html b/_includes/session.html
@@ -0,0 +1,26 @@
+{%- 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>
+      {% if session.presenterID %}
+        <h4 class="session-presenterID mt-05">
+          {% assign presenters = site.data.presenters[include.year] %}
+          {% assign presenterCount = session.presenterID.size %}
+          {%- for presenterID in session.presenterID -%}
+            {%- for presenter in presenters -%}
+              {%- if presenter.presenterID == presenterID -%}
+                {% assign name = presenter.name %}
+              {%- endif -%}
+            {%- endfor -%}
+            {% assign presenterCount = presenterCount | minus:1 %}
+            {{ name }}<br>
+          {%- endfor -%}
+        </h4>
+      {% endif %}
+    </header>
+  </div>
+  {%- endif -%}
+{%- endfor -%}
diff --git a/_sass/_base.scss b/_sass/_base.scss
@@ -35,7 +35,8 @@ blockquote {
   border-left: 1px dashed var(--black);
 }
 
-h2, h3 {
+h2,
+h3 {
   margin-top: 1.5em;
   margin-bottom: 0em;
 }
@@ -45,27 +46,45 @@ table {
   line-height: 1.625;
 }
 
-table th:first-child {
-  min-width: 120px;
-}
-
-table th:nth-child(2) {
-  min-width: 75px;
-}
-
-table tr td:nth-child(3) {
-  font-size: 0.875rem;
-  line-height: 1.25rem;
-}
-
 table tr {
   border: 1px dashed;
   border-left: 0;
   border-right: 0;
   border-bottom-color: var(--black);
 }
 
-table td, table th {
+table td,
+table th {
   padding: 0.5em;
   vertical-align: top;
-}
+}
+
+.register-table {
+  & th:first-child {
+    min-width: 120px;
+  }
+
+  & th:nth-child(2) {
+    min-width: 75px;
+  }
+
+  & tr td:nth-child(3) {
+    font-size: 0.875rem;
+    line-height: 1.25rem;
+  }
+}
+
+.schedule-table {
+  & th:first-child {
+    width: 1%;
+    white-space: nowrap;
+    border-right: 1px dashed var(--black);
+  }
+  & .time-cell:first-child {
+    border-right: 1px dashed var(--black);
+  }
+  tr:not(.sticky):hover .time-cell:first-child {
+    color: var(--accent);
+  }
+
+}
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
@@ -4,6 +4,14 @@
   position: relative;
 }
 
+.sticky {
+  position: sticky;
+}
+
+.top-0 {
+  top: 0;
+}
+
 .overflow-hidden {
   overflow: hidden;
 }
@@ -103,6 +111,14 @@
   padding: 0;
 }
 
+.pl-0 {
+  padding-left: 0;
+}
+
+.pl-1 {
+  padding-left: 1rem;
+}
+
 .pt-4 {
   padding-top: 1rem;
 }
@@ -182,6 +198,10 @@
   border-width: 2px;
 }
 
+.border-0	{
+  border-width: 0px;
+}
+
 .outlined:hover,
 .outlined:focus {
   outline: 1px solid var(--black);
@@ -202,4 +222,14 @@
   min-height: 2rem;
   overflow: hidden;
   margin-bottom: -4px;
-}
+}
+
+.presenter:has(*:target) {
+  .presenter-name:before {
+    margin-right: 1ch;
+    margin-left: -2ch;
+    content: "*";
+    color: var(--accent);
+    font-family: var(--font-family-display-mono);
+  }
+}
diff --git a/_sass/_typography.scss b/_sass/_typography.scss
@@ -68,6 +68,10 @@
   text-align: center;
 }
 
+.text-left {
+  text-align: left;
+}
+
 .list-none {
   list-style-type: none;
 }
@@ -99,3 +103,19 @@
 .no-underline {
   text-decoration-line: none;
 }
+
+.whitespace-nowrap {
+  white-space: nowrap;
+}
+
+.uppercase {
+  text-transform: uppercase;
+}
+
+.not-italic {
+  font-style: normal;
+}
+
+.tracking-wide {
+  letter-spacing: 0.025em;
+}
diff --git a/environment.md b/environment.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-order: 3
+order: 6
 title: "Environment"
 ---
 

diff --git a/index.md b/index.md
@@ -17,19 +17,15 @@ Drawing on practices of [local-first](https://www.inkandswitch.com/local-first/)
 
 {:.font-display.mt-1}
 
-## Announced Presenters
+## Sessions and Presenters
 
 Over the course of a day we will cover the PAST, PRESENT, and FUTURE with short keynote talks, workshops, and activities on the local network. Presenters include:
 
-{% assign sortedPresenters = site.data.presenters[2024] %}
 
-{%- for presenter in sortedPresenters -%}
-<ul>{% include presenter-details.html year=2024 %}</ul>
-{%- endfor -%}
+<a href="/program" class="text-sm border border-inherit active:bg-accent font-mono antialiased rounded p-1 px-2 no-underline outlined active:text-white active:outline-accent">View program</a>
 
 In addition, attendees will be able to sign up to give lightening talks, lead conversations, or host impromptu jams in available open spaces
 
-
 The conference has a [Code of Conduct](https://ournetworks.ca/code-of-conduct/).
 
 <pre role="img" aria-label="ASCII divider" class="font-display-mono aliased text-10 inline-flex max-w-prose overflow-hidden w-100">
@@ -45,6 +41,9 @@ Registration is now open!
 
 We suggest $60 with other registration levels on a sliding scale from $30-120 depending on your financial situation. 
 
+
+{:.register-table}
+
 | Level              | Price | Details |
 |:-----------------------|:------|:--------|
 | Supporter | $120 | If your org or company is paying or your registration can be reimbursed, consider registering as organization supporter. This allows us to offer reduced cost admissions and scholarships. |

diff --git a/previous-years.md b/previous-years.md
@@ -1,5 +1,5 @@
 ---
 layout: page
-order: 3
+order: 7
 title: "Previous years"
 ---