aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormu <mu@m.m>2019-06-26 19:46:30 +0200
committermu <mu@m.m>2019-06-26 19:46:30 +0200
commiteb1659dd8bfb21442ee6582e24b0716bd3d4f36d (patch)
treed382054367a6cade42aa9d2da0b08fabbcf83fc9
parent2590a782eb28a1d387cb2c6235826cf722495741 (diff)
parent3c0a1783bdf48593618230f8b2dbcea5570916ce (diff)
downloadwww-eb1659dd8bfb21442ee6582e24b0716bd3d4f36d.tar.gz
www-eb1659dd8bfb21442ee6582e24b0716bd3d4f36d.zip
Merge branch 'master' of ssh://git.gnunet.org/www
-rw-r--r--common/navigation.j2.inc1
-rw-r--r--template/video.html.j252
2 files changed, 34 insertions, 19 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 2270973f..493a02b7 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -80,6 +80,7 @@
80 </a> 80 </a>
81 <ul class="dropdown-menu" aria-labelledby="navbarMain"> 81 <ul class="dropdown-menu" aria-labelledby="navbarMain">
82 <li><a class="dropdown-item" href="tutorial.html">{{ _("Tutorials") }}</a></li> 82 <li><a class="dropdown-item" href="tutorial.html">{{ _("Tutorials") }}</a></li>
83 <li><a class="dropdown-item" href="video.html">{{ _("Videos") }}</a></li>
83 <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") }}</a></li> 84 <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") }}</a></li>
84 <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org">{{ _("Handbook") }}</a></li> 85 <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org">{{ _("Handbook") }}</a></li>
85 <li><a class="dropdown-item" target="_blank" href="https://rest.gnunet.org">{{ _("REST API") }}</a></li> 86 <li><a class="dropdown-item" target="_blank" href="https://rest.gnunet.org">{{ _("REST API") }}</a></li>
diff --git a/template/video.html.j2 b/template/video.html.j2
index 90eebb9b..8198d3d4 100644
--- a/template/video.html.j2
+++ b/template/video.html.j2
@@ -1,31 +1,45 @@
1{% extends "common/base.j2" %} 1{% extends "common/base.j2" %}
2{% block body_content %} 2{% block body_content %}
3<div class="jumbotron">
4 <div class="container text-center">
5 <h1>{{ _("Media related to GNUnet") }}</h1>
6
7 <p>
8 {% trans %}
9 Over the years we've given a couple of talks, workshops and other presentations
10 which have been recorded. The list below is neither chronological in order, nor
11 complete.
12 {% endtrans %}
13 </p>
14 </div>
15</div>
16
17<div class="container adorn_h3_bracket"> 3<div class="container adorn_h3_bracket">
4<div class="container adorn_h3_bracket">
5 <div class="container">
6 <div class="text-center">
7 <header>
8 <h1>{{ _("Talks related to GNUnet") }}</h1>
9 </header>
10 </div>
11 </div>
12
18 <div class="row"> 13 <div class="row">
19 <div class="col-lg-4"> 14 <div class="col-lg-12">
20 15
21 <h3>{{ _("2017") }}</h3>
22 <h3>{{ _("2016") }}</h3>
23 <h3>{{ _("2015") }}</h3> 16 <h3>{{ _("2015") }}</h3>
17 <ul>
18 <li><a href="https://web.archive.org/web/20160507034806/https://gnunet.org/guix2015video">Reproducible Software Deployment with GNU Guix</a></li>
19 </ul>
24 <h3>{{ _("2014") }}</h3> 20 <h3>{{ _("2014") }}</h3>
21 <ul>
22 <li><a href="/web/20160507034806/https://gnunet.org/31c3videos">31c3 "We fix the net" workshop talks</a></li>
23 <li><a href="/web/20160507034806/https://gnunet.org/ghm2014knock">Julian Kirsch on "Knocking down the HACIENDA"</a> at GHM 2014</li>
24 <li><a href="/web/20160507034806/https://gnunet.org/schaar2014tum">Peter Schaar on "Technik, Recht und Ɯberwachung"</a> at TUM</li>
25 <li><a href="/web/20160507034806/https://gnunet.org/oxford2014grothoff">Christian Grothoff on "A Public Key Infrastructure for Social Movements in the Age of Universal Surveillance"</a> at the Univeristy of Oxford</li>
26 <li><a href="/web/20160507034806/https://gnunet.org/coe">Jacob Appelbaum, Douwe Korff and Christian Grothoff on "After Snowden: using law and technology to counter snooping" at Counsil of Europe </a></li>
27 </ul>
25 <h3>{{ _("2013") }}</h3> 28 <h3>{{ _("2013") }}</h3>
29 <ul>
30 <li><a href="/web/20160507034806/https://gnunet.org/bart2013ccc">Bart Polot on "GNUnet CADET and GNUnet Conversation" at YBTI/30c3</a></li>
31 <li><a href="/web/20160507034806/https://gnunet.org/video-30c3-talk-gnu-name-system">2013: Christian Grothoff on "The GNU Name System" at 30c3</a></li>
32 <li><a href="/web/20160507034806/https://gnunet.org/markus2013bsdefense">Markus Teich on "Monkey - Generating Useful Bug Reports Automatically" at TUM</a></li>
33 <li><a href="/web/20160507034806/https://gnunet.org/videoghm2013">Christian Grothoff "The GNU Name System and the Future of Social Networking with GNUnet" at GHM</a></li>
34 <li><a href="/web/20160507034806/https://gnunet.org/internetistschuld">Christian Grothoff, Carlo von Lynx, Jacob Appelbaum and Richard Stallman: "You broke the Internet. We're making ourselves a GNU one."</a> in Berlin</li>
35 <li><a href="/web/20160507034806/https://gnunet.org/tor2013tum-video">Roger Dingledine and Jacob Appelbaum: "Q &amp; A" at TUM</a></li>
36 <li><a href="/web/20160507034806/https://gnunet.org/regex-max-defense">Maximilian Szengel on "Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks" at TUM</a></li>
37 </ul>
26 <h3>{{ _("2012") }}</h3> 38 <h3>{{ _("2012") }}</h3>
27 <h3>{{ _("2011") }}</h3> 39 <ul>
28 <h3>{{ _("2010") }}</h3> 40 <li><a href="/web/20160507034806/https://gnunet.org/martin-ms-defense-gads">Martin Schanzenbach on "A Censorship-Resistant and Fully Decentralized Naming System" at TUM</a></li>
41 <li><a href="/web/20160507034806/https://gnunet.org/rms2012tum">Richard Stallman on "Copyright vs. Community" at TUM</a></li>
42 </ul>
29 </div> 43 </div>
30 </div> 44 </div>
31</div> 45</div>