From 061281cf093d716b8ad5c885a0181279fed2cbd8 Mon Sep 17 00:00:00 2001
From: Sergi Delgado Segura <sergi.delgado.s@gmail.com>
Date: Tue, 29 Oct 2024 13:43:51 -0400
Subject: [PATCH] Adds tentative agenda for 2024

---
 _data/agenda.yml   | 76 +++++++++++++++++-----------------------------
 _pages/agenda.html | 19 +++++++-----
 _sass/_agenda.scss |  5 +--
 3 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/_data/agenda.yml b/_data/agenda.yml
index afa8947..409727d 100644
--- a/_data/agenda.yml
+++ b/_data/agenda.yml
@@ -1,58 +1,38 @@
-# - time: 9:00 - 9:30
-#   topic: Welcoming
+- time: 9:00 - 10:00
+  topic: Welcoming
 
-# - time: 9:30 - 10:00
-#   speaker: Sergi Delgado
-#   topic: Opening remarks
+- time: 10:00 - 10:15
+  speaker: Clara Shikhelman and Sergi Delgado
+  topic: Opening remarks
 
-# - time: 10:00 - 10:25
-#   speaker: Maria Apostolaki
-#   topic: Network Security For Blockchain Network
+- time: 10:15 - 11:20
+  speaker: [Sarah Meiklejohn, Jonas Nick, Josie Baker]
+  topic: [De-anonymization in Bitcoin, Ready-to-Use Distributed Key Generation for FROST, Combining Cryptographic Protocols]
 
-# - time: 10:25 - 10:50
-#   speaker: Martin Zumsande
-#   topic: Bitcoin Core - P2P In Practice
+- time: 11:20 - 11:40
+  topic: Coffee Break
 
-# - time: 10:50 - 11:15
-#   speaker: Ethan Heilman
-#   topic: An Exploration Of Bitcoin's P2P Network And Its Security
+- time: 11:40 - 12:30
+  speaker: Chelsea Kolmo and Jonas Nick (Bitcoin research prize winners)
+  topic: MuSig2 and FROST
 
-# - time: 11:15 - 11:35
-#   topic: Coffee Break
+- time: 12:30 - 14:15
+  topic: Lunch Break
 
-# - time: 11:35 - 12:00
-#   speaker: Pieter Wuille
-#   topic: Cluster Mempool - Fixing Relay of Dependent Transactions
+- time: 14:15 - 15:20
+  speaker: [Guilia Fanti, Matt Corallo, Hannes Hartenstein and Matthias Grundmann]
+  topic: [Strategic Latency Reduction in Blockchain Peer-to-Peer Networks, Lighting Pathfinding Privacy and Reliability, Modeling Aspects of the Bitcoin Universe]
 
-# - time: 12:00 - 12:30
-#   speaker: Dongning Guo and Ling Ren (Bitcoin research prize winners)
-#   topic: "Bitcoin’s Latency–Security Analysis Made Simple"
+- time: 15:20 - 15:40
+  topic: Coffee Break
 
-# - time: 12:30 - 14:00
-#   topic: Lunch Break
+- time: 15:40 - 16:40
+  speaker: Group Session
+  topic: Bitcoin Development Discussion
 
-# - time: 14:00 - 14:25
-#   speaker: Mark Erhardt
-#   topic: From Paper To BIP
+- time: 16:40 - 16:50
+  speaker: Clara Shikhelman and Sergi Delgado
+  topic: Closing remarks
 
-# - time: 14:25 - 14:50
-#   speaker: Victor Shoup
-#   topic: Fast Batched Asynchronous Distributed Key Generation
-
-# - time: 14:50 - 15:10
-#   topic: Coffee Break
-
-# - time: 15:10 - 15:35
-#   speaker: Carla Kirk-Cohen
-#   topic: From Paper To Bolt
-
-# - time: 15:35 - 16:00
-#   speaker: Benedikt Bünz
-#   topic: Recent Developments In (Bitcoin Compatible) zk-SNARKs
-
-# - time: 16:00 - 16:05
-#   speaker: Sergi Delgado
-#   topic: Closing remarks
-
-# - time: 16:05 - 18:00
-#   topic: Happy Hour
\ No newline at end of file
+- time: 16:50 - 18:00
+  topic: Happy Hour
diff --git a/_pages/agenda.html b/_pages/agenda.html
index c8bd5d7..9b0ae3f 100644
--- a/_pages/agenda.html
+++ b/_pages/agenda.html
@@ -18,20 +18,25 @@ <h2>AGENDA TBD</h2>
             <thead>
                 <tr>
                     <th class="row-1 agenda-time"><center>Time</center></th>
-                    <th class="row-2 agenda-activity"><center>Activity</center></th>  
+                    <th class="row-2 agenda-activity"><center>Activity</center></th>
                 </tr>
             </thead>
             {% for agenda in site.data.agenda %}
                 <tr>
                     <td>{{ agenda.time }}</td>
-                    {% if agenda.speaker %} 
-                        {% if agenda.link %}
-                            <td><br><b><a href="/#{{ agenda.link }}"">{{ agenda.speaker }}</a></b><br>{{ agenda.topic }}<br><br></td>
-                        {% else %}
+                    {% if agenda.speaker.first %}
+                        <td>
+                        {% for item in agenda.speaker %}
+                            <br><b>{{ item }}</b><br>{{ agenda.topic[forloop.index0] }}<br>
+                        {% endfor %}
+                        <br>
+                        </td>
+                    {% else %}
+                        {% if agenda.speaker %}
                             <td><br><b>{{ agenda.speaker }}</b><br>{{ agenda.topic }}<br><br></td>
+                        {% else %}
+                            <td><br>{{ agenda.topic }}<br><br></td>
                         {% endif %}
-                    {% else %}
-                        <td><br>{{ agenda.topic }}<br><br></td>
                     {% endif %}
                 </tr>
             {% endfor %}
diff --git a/_sass/_agenda.scss b/_sass/_agenda.scss
index 1ac3e66..38b4cf3 100644
--- a/_sass/_agenda.scss
+++ b/_sass/_agenda.scss
@@ -5,7 +5,7 @@
   word-wrap: break-word;
 
   td {
-    white-space: pre-wrap;
+    white-space: normal;
     word-wrap: break-word;
     text-overflow: ellipsis;
   }
@@ -33,7 +33,8 @@
         text-decoration: none;
     }
     b {
-        color: #feda09;
+        color: black;
+        font-size: 110%;
     }
   }
 }