commit 7fc37edf6937a18afe5cf814f0b1fbd39125e8ae Author: antonela <antonela@torproject.org> Date: Mon Aug 24 09:37:11 2020 -0300 Fix typos, move host to the top, fixed yt link --- templates/privchat.html | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/templates/privchat.html b/templates/privchat.html index 91e49632..d5de746e 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -25,7 +25,7 @@ <div class="container py-3 mt-5"> <p class="h2 text-primary" target="_blank">Chapter #2 - the Good, the Bad, and the Ugly of Censorship Circumvention <div> - <p><span class="text-primary nick" style="font-size:18px;"><mark>August 28th ∙ 10:00 AM Pacific Time ∙ 17:00 UTC ∙ 13:00 Eastern Time ∙ <a href="https://youtu.be/gSyDvG4Z308" title="Tor Project You Tube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p> + <p><span class="text-primary nick" style="font-size:18px;"><mark>August 28th ∙ 10:00 AM Pacific Time ∙ 17:00 UTC ∙ 13:00 Eastern Time ∙ <a href="https://youtu.be/aOOChyMCZH4" title="Tor Project You Tube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p> </div> <a class="btn btn-small bg-primary text-light my-4" href="https://youtu.be/aOOChyMCZH4" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the date") }} </a></p> <div> @@ -36,7 +36,29 @@ </div> <div class="container pt-5 justify-content-center"> - <h4>Participants</h4> + + <h4>Host</h4> + + <div class="row"> + <div class="container"> + <div class="card flex-row flex-wrap py-3"> + <div class="col-3"> + <img class="card-img-top" src="{{ '/static/images/privchat/cory.png' }}" alt=""> + </div> + <div class="col"> + <div class="card-block px-2"> + <div class="pb-4"> + <h4 class="display-4 text-primary">Cory Doctorow</h4> + <strong class="display-5 text-primary mb-4">Electronic Frontier Foundation, MIT</strong> + </div> + <p class="text-tpo"><a href="https://craphound.com" target="_blank" title="Cory Doctorow">Cory Doctorow</a> is a science fiction author, activist, and journalist. He is the author of RADICALIZED and WALKAWAY, science fiction for adults, a YA graphic novel called IN REAL LIFE, the nonfiction business book INFORMATION DOESN’T WANT TO BE FREE, and young adult novels like HOMELAND, PIRATE CINEMA and LITTLE BROTHER. His latest book is POESY THE MONSTER SLAYER, a picture book for young readers. His next book is ATTACK SURFACE, an adult sequel to LITTLE BROTHER. He maintains a daily blog at Pluralistic.net. He works for the Electronic Frontier Foundation, is a MIT Media Lab Research Affiliate, is a Visiting Professor of Computer Science at Open University, a Visiting Professor of Practice at the University of North Carolina’s School of Library and Information Science and co-founded the UK Open Rights Group. Born in Toronto, Canada, he now lives in Los Angeles.</p> + </div> + </div> + </div> + </div> + </div> + + <h4 class="mt-5">Participants</h4> <div class="row"> <div class="container"> @@ -103,27 +125,6 @@ </div> </div> - <h4>Host</h4> - - <div class="row"> - <div class="container"> - - <div class="card flex-row flex-wrap py-3"> - <div class="col-3"> - <img class="card-img-top" src="{{ '/static/images/privchat/cory.png' }}" alt=""> - </div> - <div class="col"> - <div class="card-block px-2"> - <div class="pb-4"> - <h4 class="display-4 text-primary">Cory Doctorow</h4> - <strong class="display-5 text-primary mb-4">Electronic Frontier Foundation, MIT</strong> - </div> - <p class="text-tpo"><a href="https://craphound.com" target="_blank" title="Cory Doctorow">Cory Doctorow</a> is a science fiction author, activist, and journalist. He is the author of RADICALIZED and WALKAWAY, science fiction for adults, a YA graphic novel called IN REAL LIFE, the nonfiction business book INFORMATION DOESN’T WANT TO BE FREE, and young adult novels like HOMELAND, PIRATE CINEMA and LITTLE BROTHER. His latest book is POESY THE MONSTER SLAYER, a picture book for young readers. His next book is ATTACK SURFACE, an adult sequel to LITTLE BROTHER. He maintains a daily blog at Pluralistic.net. He works for the Electronic Frontier Foundation, is a MIT Media Lab Research Affiliate, is a Visiting Professor of Computer Science at Open University, a Visiting Professor of Practice at the University of North Carolina’s School of Library and Information Science and co-founded the UK Open Rights Group. Born in Toronto, Canada, he now lives in Los Angeles.</p> - </div> - </div> - </div> - - </div> <div class="container"> @@ -143,7 +144,7 @@ <img class="card-img-top mb-5" src="{{ '/static/images/privchat/privchat1-cover.png' }}" alt="PrivChat with Tor"> <p class="h2 text-primary" target="_blank">Chapter #1 - Online Privacy in 2020: Activism & COVID-19</p> <div> - <p><span class="text-primary nick"><mark>With Carmela Troncoso, Daniel Kahn Gillmor and Matt Michell. Hosted by Roger Dingledine.</mark></span></p> + <p><span class="text-primary nick"><mark>With Carmela Troncoso, Daniel Kahn Gillmor and Matt Mitchell. Hosted by Roger Dingledine.</mark></span></p> </div> <a class="btn btn-small bg-primary text-light mb-3" href="https://www.youtube.com/watch?v=gSyDvG4Z308" target="_blank"><i class="mr-2 pt-1 fab fa-youtube"></i>Watch</a> <div>