From: Zoe <zoe@fsf.org>
Date: Thu, 5 Mar 2020 03:14:40 +0000 (-0500)
Subject: events update with workshops
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=03a08f1ebd126ef7d599294938332aae84c965c1;p=libreplanet-static.git

events update with workshops
---

diff --git a/2020/fun/index.html b/2020/fun/index.html
index 28fbd954..f7d7ed05 100755
--- a/2020/fun/index.html
+++ b/2020/fun/index.html
@@ -1,22 +1,103 @@
 <!--#include virtual="/2020/includes/header.html"-->
 
-<title>LibrePlanet &mdash; Events </title>
+<title>LibrePlanet &mdash; Workshops & Social Events </title>
 
 <!--#include virtual="/2020/includes/banner.html"-->
 <!--#include virtual="/2020/includes/sidebar.html"-->
 
-<h1>Program Fun</h1>
-<h2>Fun Times at LibrePlanet!</h2>
-<p>LibrePlanet is full of opportunities for fun!</p>
+<h1>All the fun things that are organized besides the official session schedule</h1>
+<br>
+<h2>WORKSHOPS</h2>
+  <h3>SATURDAY 10:40 - 12:10 - Keysigning</h3>
+<table class="views-view-grid cols-3">
+  
+  <tbody>
+          <tr  class="row-1 row-first row-last">
+                  <td  class="col-1 col-first">
+              
+  <div class="views-field views-field-value">        <span class="field-content"><a href="/2020/speakers/"><div id="">Keysigning</div></a></span>  </div>  
+  <div class="views-field views-field-value-3">        <span class="field-content"><i class="glyphicon glyphicon-home"></i>: Justice Room</span>  </div>  
+  <div class="views-field views-field-value-7">        <span class="field-content"></span>  </div>  
+  <div class="views-field views-field-value-6">        <span class="field-content"><img class="schedulepic" style="float:left;  max-width:23px; max-height:23px; margin-right:5px; border-radius: 5px" src="https://static.fsf.org/nosvn/libreplanet/2020/assets/logo-lores.png">
+ Dave Hunt
+<div style="clear:both"></div></span>  </div>  
+  <div class="views-field views-field-regex-rewrite">        <span class="field-content"><div class="guestspeakers">
+   
+
+   
+
+
+</div></span>  </div>          </td>
+              </tr>
+      </tbody>
+</table>
+
+  <h3>SATURDAY 14:30 - 16:00 - MADDES Secret Lair: Matty's Advanced Deniable Disk Encryption Setup</h3>
+<table class="views-view-grid cols-3">
+  
+  <tbody>
+          <tr  class="row-1 row-first row-last">
+                  <td  class="col-1 col-first">
+              
+  <div class="views-field views-field-value">        <span class="field-content"><a href="/2020/speakers/"><div id="">MADDES Secret Lair: Matty's Advanced Deniable Disk Encryption Setup</div></a></span>  </div>  
+  <div class="views-field views-field-value-3">        <span class="field-content"><i class="glyphicon glyphicon-home"></i>: Justice Room</span>  </div>  
+  <div class="views-field views-field-value-7">        <span class="field-content"></span>  </div>  
+  <div class="views-field views-field-value-6">        <span class="field-content"><img class="schedulepic" style="float:left;  max-width:23px; max-height:23px; margin-right:5px; border-radius: 5px" src="https://static.fsf.org/nosvn/libreplanet/2020/assets/logo-lores.png">
+ Matt Lavigne
+<div style="clear:both"></div></span>  </div>  
+  <div class="views-field views-field-regex-rewrite">        <span class="field-content"><div class="guestspeakers">
+   
+
+   
+
+
+</div></span>  </div>          </td>
+              </tr>
+      </tbody>
+</table>
+
+  <h3>SUNDAY 10:40 - 12:10 - Music Blocks workshop</h3>
+<table class="views-view-grid cols-3">
+  
+  <tbody>
+          <tr  class="row-1 row-first row-last">
+                  <td  class="col-1 col-first">
+              
+  <div class="views-field views-field-value">        <span class="field-content"><a href="/2020/speakers/"><div id="">Music Blocks workshop</div></a></span>  </div>  
+  <div class="views-field views-field-value-3">        <span class="field-content"><i class="glyphicon glyphicon-home"></i>: Justice Room</span>  </div>  
+  <div class="views-field views-field-value-7">        <span class="field-content"></span>  </div>  
+  <div class="views-field views-field-value-6">        <span class="field-content"><img class="schedulepic" style="float:left;  max-width:23px; max-height:23px; margin-right:5px; border-radius: 5px" src="https://my.fsf.org/sites/default/files/webform/profiles_ulibarri.jpg">
+ Devin Ulibarri and Walter Bender
+<div style="clear:both"></div></span>  </div>  
+  <div class="views-field views-field-regex-rewrite">        <span class="field-content"><div class="guestspeakers">
+   
+
+   
+
+
+</div></span>  </div>          </td>
+              </tr>
+      </tbody>
+</table>
+
+<h2> SOCIAL EVENTS</h2> 
 <h3>Friday night</h4>
 <ul>
-<li>Friday night open house, 17:00-19:30:</i> On Friday evening, the FSF is hosting an open house at the FSF office. You'll be able to pick up your conference badge (and purchase raffle tickets), allowing you to skip the line on Saturday morning! The FSF office is a short walk from the Downtown Crossing, State, and Park Street MBTA stops. The FSF office is an accessible space. 51 Franklin Street, 5th Floor, Boston, MA 02110.</li>
-<li>After the open house, all women, genderqueer, non-binary, and gender non-conforming people interested in free software are invited to the Welcome Dinner. Details TBA.</li>
+<p><li>Friday night open house, 17:00-19:30:</p></i> 
+<p>On Friday evening, the FSF is hosting an open house at the FSF office. You'll be able to pick up your conference badge (and purchase raffle tickets), allowing you to skip the line on Saturday morning! The FSF office is a short walk from the Downtown Crossing, State, and Park Street MBTA stops.</p>
+<p>The FSF office is an accessible space. 51 Franklin Street, 5th Floor, Boston, MA 02110.<p></li>
+<br>
+<li>After the open house, all women, genderqueer, non-binary, and gender non-conforming people interested in free software are invited to the Welcome Dinner at 20:00pm. Further fetails TBA.</li>
 </ul>
+
 <h3>Saturday night</h4>
 <ul>
-<li><em>Saturday night party, TIME TBA:</em> Join us Saturday night after the Free Software Awards to celebrate free software! We will have gratis snacks, and your first drink is on us. A full dinner menu is available for purchase. The venue is accessible, and all ages are welcome! The party venue will be announced shortly! </li>
-<li><em>Saturday, 19:00-21:30:</em> Looking for a little quieter social time? The FSF office will be open late for hacking and hanging out. Snacks, non-alcoholic drinks, and power will be provided. This is an alcohol-free event. The office is at 51 Franklin Street, Fifth Floor, Boston, MA 02110.</li>
+<li><p><em>Saturday night party, 19:00 - 23:00</em></p> 
+<p>Join us Saturday night after the Free Software Awards to celebrate free software! We will have gratis snacks, and your first drink is on us. A full dinner menu is available for purchase. The venue is accessible, and all ages are welcome! The party venue will be announced shortly!</p></li>
+<br>
+<li><p><em>Saturday, 19:00-21:30:</em></p> 
+<p>Looking for a little quieter social time? The FSF office will be open late for hacking and hanging out. Snacks, non-alcoholic drinks, and power will be provided. This is an alcohol-free event.</p> 
+<p>The office is at 51 Franklin Street, Fifth Floor, Boston, MA 02110.</li></p>
 </ul>
 <h3>Sunday night</h4>
 <ul>
diff --git a/2020/includes/nav-list-1.html b/2020/includes/nav-list-1.html
index 08b4be67..1481b986 100644
--- a/2020/includes/nav-list-1.html
+++ b/2020/includes/nav-list-1.html
@@ -2,4 +2,4 @@
 <!-- <li class="livestream-link"><a href="/2020/live">Live Video Recordings <span class="glyphicon glyphicon-globe"></span></a></li> -->
 <li><a href="/2020/program">Schedule</a></li>
 <li><a href="/2020/speakers">Bios & Talks</a></li>
-<li><a href="/2020/fun">Events</a></li>
+<li><a href="/2020/fun">Workshops & Social Events</a></li>
diff --git a/2020/program/index.html b/2020/program/index.html
index 5c422fc9..cb4fc3f7 100755
--- a/2020/program/index.html
+++ b/2020/program/index.html
@@ -35,77 +35,6 @@ Watch session videos on our GNU MediaGoblin instance!</button></a><br><br><br>--
 <!--#include virtual="/2020/includes/generated-sessions.html"-->
 </div>
 
-  <h3>SATURDAY 10:40 - 12:10 - Keysigning</h3>
-<table class="views-view-grid cols-3">
-  
-  <tbody>
-          <tr  class="row-1 row-first row-last">
-                  <td  class="col-1 col-first">
-              
-  <div class="views-field views-field-value">        <span class="field-content"><a href="/2020/speakers/"><div id="">Keysigning</div></a></span>  </div>  
-  <div class="views-field views-field-value-3">        <span class="field-content"><i class="glyphicon glyphicon-home"></i>: Justice Room</span>  </div>  
-  <div class="views-field views-field-value-7">        <span class="field-content"></span>  </div>  
-  <div class="views-field views-field-value-6">        <span class="field-content"><img class="schedulepic" style="float:left;  max-width:23px; max-height:23px; margin-right:5px; border-radius: 5px" src="https://static.fsf.org/nosvn/libreplanet/2020/assets/logo-lores.png">
- Dave Hunt
-<div style="clear:both"></div></span>  </div>  
-  <div class="views-field views-field-regex-rewrite">        <span class="field-content"><div class="guestspeakers">
-   
-
-   
-
-
-</div></span>  </div>          </td>
-              </tr>
-      </tbody>
-</table>
-
-  <h3>SATURDAY 14:30 - 16:00 - MADDES Secret Lair: Matty's Advanced Deniable Disk Encryption Setup</h3>
-<table class="views-view-grid cols-3">
-  
-  <tbody>
-          <tr  class="row-1 row-first row-last">
-                  <td  class="col-1 col-first">
-              
-  <div class="views-field views-field-value">        <span class="field-content"><a href="/2020/speakers/"><div id="">MADDES Secret Lair: Matty's Advanced Deniable Disk Encryption Setup</div></a></span>  </div>  
-  <div class="views-field views-field-value-3">        <span class="field-content"><i class="glyphicon glyphicon-home"></i>: Justice Room</span>  </div>  
-  <div class="views-field views-field-value-7">        <span class="field-content"></span>  </div>  
-  <div class="views-field views-field-value-6">        <span class="field-content"><img class="schedulepic" style="float:left;  max-width:23px; max-height:23px; margin-right:5px; border-radius: 5px" src="https://static.fsf.org/nosvn/libreplanet/2020/assets/logo-lores.png">
- Matt Lavigne
-<div style="clear:both"></div></span>  </div>  
-  <div class="views-field views-field-regex-rewrite">        <span class="field-content"><div class="guestspeakers">
-   
-
-   
-
-
-</div></span>  </div>          </td>
-              </tr>
-      </tbody>
-</table>
-
-  <h3>SUNDAY 10:40 - 12:10 - Music Blocks workshop</h3>
-<table class="views-view-grid cols-3">
-  
-  <tbody>
-          <tr  class="row-1 row-first row-last">
-                  <td  class="col-1 col-first">
-              
-  <div class="views-field views-field-value">        <span class="field-content"><a href="/2020/speakers/"><div id="">Music Blocks workshop</div></a></span>  </div>  
-  <div class="views-field views-field-value-3">        <span class="field-content"><i class="glyphicon glyphicon-home"></i>: Justice Room</span>  </div>  
-  <div class="views-field views-field-value-7">        <span class="field-content"></span>  </div>  
-  <div class="views-field views-field-value-6">        <span class="field-content"><img class="schedulepic" style="float:left;  max-width:23px; max-height:23px; margin-right:5px; border-radius: 5px" src="https://my.fsf.org/sites/default/files/webform/profiles_ulibarri.jpg">
- Devin Ulibarri and Walter Bender
-<div style="clear:both"></div></span>  </div>  
-  <div class="views-field views-field-regex-rewrite">        <span class="field-content"><div class="guestspeakers">
-   
-
-   
-
-
-</div></span>  </div>          </td>
-              </tr>
-      </tbody>
-</table>
 
 
 <!--#include virtual="/2020/includes/footer.html"-->