aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2019-06-28 17:08:01 +0200
committerxrs <xrs@mail36.net>2019-06-28 17:08:01 +0200
commit718742bb5608f583b3f09dbd1068158115708487 (patch)
tree6d990e5a2ad67e80d7cf2c4c9b741eb71b4d4684
parent22c159df30c1b3b8ca7d4c44e9f100240d7464d8 (diff)
downloadwww-718742bb5608f583b3f09dbd1068158115708487.tar.gz
www-718742bb5608f583b3f09dbd1068158115708487.zip
fix links and link colors
-rw-r--r--static/styles.sass17
-rw-r--r--template/engage.html.j24
-rw-r--r--template/index.html.j214
-rw-r--r--template/video.html.j251
4 files changed, 59 insertions, 27 deletions
diff --git a/static/styles.sass b/static/styles.sass
index 7f5f5741..8a29afa9 100644
--- a/static/styles.sass
+++ b/static/styles.sass
@@ -52,12 +52,12 @@ code
52 52
53// hyperlinks and buttons 53// hyperlinks and buttons
54 54
55#body_content a 55//#body_content a
56 text-decoration: underline 56// text-decoration: underline
57 color: #357edd 57// color: #357edd
58 &:link, &:visited 58// &:link, &:visited
59 text-decoration: underline 59// text-decoration: underline
60 color: #357edd 60// color: #357edd
61 61
62a.btn 62a.btn
63 text-decoration: none !important 63 text-decoration: none !important
@@ -195,8 +195,11 @@ html
195 color: white 195 color: white
196 196
197.c_acronym 197.c_acronym
198 background-color: #217fae 198 background-color: #3498db
199 color: white 199 color: white
200 a
201 &:link &:visited
202 color: #c1d9f5
200 203
201footer a 204footer a
202 text-decoration: underline 205 text-decoration: underline
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index 75b6bdd5..6b6a1bee 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -50,7 +50,7 @@
50 </p> 50 </p>
51 <h2>Use GNUnet!</h2> 51 <h2>Use GNUnet!</h2>
52 <p> 52 <p>
53 <a href="https://gnunet.org/en/use.html">Let's gets started...</a> 53 <a href="use.html">Let's gets started...</a>
54 </p> 54 </p>
55 <h2>Report bugs!</h2> 55 <h2>Report bugs!</h2>
56 <p> 56 <p>
@@ -77,7 +77,7 @@
77 <h2>Bibliography</h2> 77 <h2>Bibliography</h2>
78 <p>If you are more the reading kind of person, please take a seat <a href="https://bib.gnunet.org/">in our libary...</a></p> 78 <p>If you are more the reading kind of person, please take a seat <a href="https://bib.gnunet.org/">in our libary...</a></p>
79 <h2>Videos</h2> 79 <h2>Videos</h2>
80 <p>...or if you rather want hear us talking to you, lean back and watch some <a href="https://gnunet.org/en/video">videos</a> of our talks at conferences.</p> 80 <p>...or if you rather want hear us talking to you, lean back and watch some <a href="video.html">videos</a> of our talks at conferences.</p>
81 </div> 81 </div>
82 82
83 <div class="col-lg-5 offset-md-1"> 83 <div class="col-lg-5 offset-md-1">
diff --git a/template/index.html.j2 b/template/index.html.j2
index f44c2036..93e0a20d 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -42,7 +42,7 @@
42 </div> 42 </div>
43 <div class="container text-center"> 43 <div class="container text-center">
44 <p> 44 <p>
45 <a class="btn btn-primary btn-lg" href="about.html"> 45 <a class="btn btn-primary btn-lg" href="#about">
46 {% trans %} 46 {% trans %}
47 About 47 About
48 {% endtrans %} 48 {% endtrans %}
@@ -71,7 +71,7 @@
71 <div class="container"> 71 <div class="container">
72 <div class="row"> 72 <div class="row">
73 <div class="container text-center"> 73 <div class="container text-center">
74 <h1>{% trans %}The Internet of tomorrow needs GNUnet today{% endtrans %}</h1> 74 <h1><a name="about">{% trans %}The Internet of tomorrow needs GNUnet today{% endtrans %}</a></h1>
75 </div> 75 </div>
76 </div> 76 </div>
77 <div class="row"> 77 <div class="row">
@@ -204,6 +204,16 @@
204 </p> 204 </p>
205 </section> 205 </section>
206 </div> 206 </div>
207 <div class="col-lg-4">
208 <section>
209 <h3>{{ _("Learn about the GNUnet") }}</h3>
210 <p>
211 {% trans %}
212 If you want to know more about the GNUnet please continue reading <a href="about.html">here</a>.
213 {% endtrans %}
214 </p>
215 </section>
216 </div>
207 </div> 217 </div>
208 </div> 218 </div>
209</div> 219</div>
diff --git a/template/video.html.j2 b/template/video.html.j2
index fbfa1b6f..81f92674 100644
--- a/template/video.html.j2
+++ b/template/video.html.j2
@@ -12,33 +12,52 @@
12 12
13 <div class="row"> 13 <div class="row">
14 <div class="col-lg-12"> 14 <div class="col-lg-12">
15 15 <!-- FIXME
16 - add videos of empty years
17 - add links (if possible from git)
18 -->
19 <h3>{{ _("2019") }}</h3>
20 <ul>
21 <li></a></li>
22 </ul>
23 <h3>{{ _("2018") }}</h3>
24 <ul>
25 <li></a></li>
26 </ul>
27 <h3>{{ _("2017") }}</h3>
28 <ul>
29 <li></a></li>
30 </ul>
31 <h3>{{ _("2016") }}</h3>
32 <ul>
33 <li></a></li>
34 </ul>
16 <h3>{{ _("2015") }}</h3> 35 <h3>{{ _("2015") }}</h3>
17 <ul> 36 <ul>
18 <li><a href="https://web.archive.org/web/20160507034806/https://gnunet.org/guix2015video">Reproducible Software Deployment with GNU Guix</a></li> 37 <li><a href="">Reproducible Software Deployment with GNU Guix</a></li>
19 </ul> 38 </ul>
20 <h3>{{ _("2014") }}</h3> 39 <h3>{{ _("2014") }}</h3>
21 <ul> 40 <ul>
22 <li><a href="/web/20160507034806/https://gnunet.org/31c3videos">31c3 "We fix the net" workshop talks</a></li> 41 <li><a href="">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> 42 <li><a href="">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> 43 <li><a href="">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> 44 <li><a href="">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> 45 <li><a href="">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> 46 </ul>
28 <h3>{{ _("2013") }}</h3> 47 <h3>{{ _("2013") }}</h3>
29 <ul> 48 <ul>
30 <li><a href="/web/20160507034806/https://gnunet.org/bart2013ccc">Bart Polot on "GNUnet CADET and GNUnet Conversation" at YBTI/30c3</a></li> 49 <li><a href="">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> 50 <li><a href="">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> 51 <li><a href="">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> 52 <li><a href="">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> 53 <li><a href="">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> 54 <li><a href="">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> 55 <li><a href="">Maximilian Szengel on "Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks" at TUM</a></li>
37 </ul> 56 </ul>
38 <h3>{{ _("2012") }}</h3> 57 <h3>{{ _("2012") }}</h3>
39 <ul> 58 <ul>
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> 59 <li><a href="">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> 60 <li><a href="">Richard Stallman on "Copyright vs. Community" at TUM</a></li>
42 </ul> 61 </ul>
43 </div> 62 </div>
44 </div> 63 </div>