Browse Source

updating speaker spots

chootka 9 years ago
parent
commit
c69f1ac3b2
2 changed files with 76 additions and 30 deletions
  1. 38 15
      _site/program/index.html
  2. 38 15
      program/index.html

+ 38 - 15
_site/program/index.html

@@ -342,34 +342,48 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td>10:30 - 11:20</td>
-			<td>
+			<td>10:30 - 10:50</td>
+			<td rowspan="2">
 				<a href="../speakers/keith-whyte/">
 					<span class="title">On being the alternative in the absence of alternatives</span></br>
 					Keith Whyte (Rhizomatica)
 				</a>
 			</td>
 			<td>
-				<a href="../speakers/sebastien-pierre/">
+				<a href="../speakers/andrew-davis/">
+					<span class="title">MTOS, Federated, Public Key Secured, Social Communications Infrastructure</span><br/>
+					Andrew Davis
+				</a>
+				<!-- <a href="../speakers/sebastien-pierre/">
 					<span class="title">Invisible Islands</br>
 				Locative New Media: Connecting the physical with the digital</span></br>
 					Sébastien Pierre
-				</a>
+				</a> -->
 			</td>
 			<td></td>
-			<td class="workshop" rowspan="2">
+			<td class="workshop" rowspan="3">
 				<a href="../speakers/surya-mattu/">
 					<span class="title">Workshop: I Think Therefore ICANN: An RPG About TLDs</span></br>
 					Surya Mattu
 				</a> + <a href="../speakers/ingrid-burrington/">Ingrid Burrington</a>
 			</td>
-			<td class="workshop" rowspan="2">
+			<td class="workshop" rowspan="3">
 				<a href="../speakers/erica-kermani/">
 					<span class="title">Workshop: The Queer Red Phone: Designing Interfaces and Community Accountability Networks Through Mesh</span></br>
 					Erica Kermani
 				</a> + <a href="../speakers/miki-foster/">Miki Foster</a>
 			</td>
 		</tr>
+		<tr>
+			<td>11:00 - 11:30</td>
+			<td>
+				<a href="../speakers/ansh-patel/">
+					<span class="title">The Pervasive Rhizome: Data Tracking Edition <strong>and</strong></br>Playful Mesh: Site-Specific Game to Visualize Network</span></br>
+					Ansh Patel
+				</a>
+			</td>
+			<td></td>
+		</tr>
 		<tr>
 			<td>11:30 - 12:00</td>
 			<td>
@@ -402,7 +416,7 @@
 					Sarah T. Gold
 				</a>
 			</td>
-			<td>Lightning Sessions</td>
+			<td rowspan="2">Lightning Sessions</td>
 			<td class="workshop" rowspan="5">
 				<a href="../speakers/andre-castro/">
 					<span class="title">Bibliotecha Workshop</span></br>
@@ -430,12 +444,12 @@
 					Dr. Lutfor Rahman
 				</a>
 			</td>
-			<td>
+			<!-- <td>
 				<a href="../speakers/ansh-patel/">
 					<span class="title">The Pervasive Rhizome: Data Tracking Edition <strong>and</strong></br>Playful Mesh: Site-Specific Game to Visualize Network</span></br>
 					Ansh Patel
 				</a>
-			</td>
+			</td> -->
 		</tr>
 		<tr>
 			<td>14:50 - 15:30</td>
@@ -470,10 +484,15 @@
 		<tr>
 			<td>17:10 - 17:30</td>
 			<td rowspan="2">
-				<a href="../speakers/jochen-maria-weber/">
+				<a href="../speakers/sebastien-pierre/">
+					<span class="title">Invisible Islands</br>
+				Locative New Media: Connecting the physical with the digital</span></br>
+					Sébastien Pierre
+				</a>
+				<!-- <a href="../speakers/jochen-maria-weber/">
 					<span class="title">Stupid, Messy Networks</span></br>
 					Jochen Maria Weber
-				</a>
+				</a> -->
 			</td>
 			<td>
 				<a href="../speakers/yifu-guo/">
@@ -506,10 +525,14 @@
 				</a> + <a href="../speakers/jennifer-gradecki/">Jennifer Gradecki</a>
 			</td>
 			<td>
-				<a href="../speakers/andrew-davis/">
+				<a href="../speakers/amelia-marzec/">
+					<span class="title">Signal Strength + The Community Phonebooth</span></br>
+					Amelia Marzec
+				</a>
+				<!-- <a href="../speakers/andrew-davis/">
 					<span class="title">MTOS, Federated, Public Key Secured, Social Communications Infrastructure</span><br/>
 					Andrew Davis
-				</a>
+				</a> -->
 			</td>
 			<td></td>
 			<td></td>
@@ -517,11 +540,11 @@
 		</tr>
 		<tr>
 			<td>18:30 - 19:00</td>
-			<td>
+			<td><!-- 
 				<a href="../speakers/amelia-marzec/">
 					<span class="title">Signal Strength + The Community Phonebooth</span></br>
 					Amelia Marzec
-				</a>
+				</a> -->
 			</td>
 			<td></td>
 			<td></td>

+ 38 - 15
program/index.html

@@ -257,34 +257,48 @@ group: navigation
 			<td></td>
 		</tr>
 		<tr>
-			<td>10:30 - 11:20</td>
-			<td>
+			<td>10:30 - 10:50</td>
+			<td rowspan="2">
 				<a href="../speakers/keith-whyte/">
 					<span class="title">On being the alternative in the absence of alternatives</span></br>
 					Keith Whyte (Rhizomatica)
 				</a>
 			</td>
 			<td>
-				<a href="../speakers/sebastien-pierre/">
+				<a href="../speakers/andrew-davis/">
+					<span class="title">MTOS, Federated, Public Key Secured, Social Communications Infrastructure</span><br/>
+					Andrew Davis
+				</a>
+				<!-- <a href="../speakers/sebastien-pierre/">
 					<span class="title">Invisible Islands</br>
 				Locative New Media: Connecting the physical with the digital</span></br>
 					Sébastien Pierre
-				</a>
+				</a> -->
 			</td>
 			<td></td>
-			<td class="workshop" rowspan="2">
+			<td class="workshop" rowspan="3">
 				<a href="../speakers/surya-mattu/">
 					<span class="title">Workshop: I Think Therefore ICANN: An RPG About TLDs</span></br>
 					Surya Mattu
 				</a> + <a href="../speakers/ingrid-burrington/">Ingrid Burrington</a>
 			</td>
-			<td class="workshop" rowspan="2">
+			<td class="workshop" rowspan="3">
 				<a href="../speakers/erica-kermani/">
 					<span class="title">Workshop: The Queer Red Phone: Designing Interfaces and Community Accountability Networks Through Mesh</span></br>
 					Erica Kermani
 				</a> + <a href="../speakers/miki-foster/">Miki Foster</a>
 			</td>
 		</tr>
+		<tr>
+			<td>11:00 - 11:30</td>
+			<td>
+				<a href="../speakers/ansh-patel/">
+					<span class="title">The Pervasive Rhizome: Data Tracking Edition <strong>and</strong></br>Playful Mesh: Site-Specific Game to Visualize Network</span></br>
+					Ansh Patel
+				</a>
+			</td>
+			<td></td>
+		</tr>
 		<tr>
 			<td>11:30 - 12:00</td>
 			<td>
@@ -317,7 +331,7 @@ group: navigation
 					Sarah T. Gold
 				</a>
 			</td>
-			<td>Lightning Sessions</td>
+			<td rowspan="2">Lightning Sessions</td>
 			<td class="workshop" rowspan="5">
 				<a href="../speakers/andre-castro/">
 					<span class="title">Bibliotecha Workshop</span></br>
@@ -345,12 +359,12 @@ group: navigation
 					Dr. Lutfor Rahman
 				</a>
 			</td>
-			<td>
+			<!-- <td>
 				<a href="../speakers/ansh-patel/">
 					<span class="title">The Pervasive Rhizome: Data Tracking Edition <strong>and</strong></br>Playful Mesh: Site-Specific Game to Visualize Network</span></br>
 					Ansh Patel
 				</a>
-			</td>
+			</td> -->
 		</tr>
 		<tr>
 			<td>14:50 - 15:30</td>
@@ -385,10 +399,15 @@ group: navigation
 		<tr>
 			<td>17:10 - 17:30</td>
 			<td rowspan="2">
-				<a href="../speakers/jochen-maria-weber/">
+				<a href="../speakers/sebastien-pierre/">
+					<span class="title">Invisible Islands</br>
+				Locative New Media: Connecting the physical with the digital</span></br>
+					Sébastien Pierre
+				</a>
+				<!-- <a href="../speakers/jochen-maria-weber/">
 					<span class="title">Stupid, Messy Networks</span></br>
 					Jochen Maria Weber
-				</a>
+				</a> -->
 			</td>
 			<td>
 				<a href="../speakers/yifu-guo/">
@@ -421,10 +440,14 @@ group: navigation
 				</a> + <a href="../speakers/jennifer-gradecki/">Jennifer Gradecki</a>
 			</td>
 			<td>
-				<a href="../speakers/andrew-davis/">
+				<a href="../speakers/amelia-marzec/">
+					<span class="title">Signal Strength + The Community Phonebooth</span></br>
+					Amelia Marzec
+				</a>
+				<!-- <a href="../speakers/andrew-davis/">
 					<span class="title">MTOS, Federated, Public Key Secured, Social Communications Infrastructure</span><br/>
 					Andrew Davis
-				</a>
+				</a> -->
 			</td>
 			<td></td>
 			<td></td>
@@ -432,11 +455,11 @@ group: navigation
 		</tr>
 		<tr>
 			<td>18:30 - 19:00</td>
-			<td>
+			<td><!-- 
 				<a href="../speakers/amelia-marzec/">
 					<span class="title">Signal Strength + The Community Phonebooth</span></br>
 					Amelia Marzec
-				</a>
+				</a> -->
 			</td>
 			<td></td>
 			<td></td>