aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2019-06-27 19:37:45 +0200
committerxrs <xrs@mail36.net>2019-06-27 19:37:45 +0200
commitbfa61e3cf2e0d4adab0c81e0b0961f4aed1cb1e9 (patch)
treef1b76ad8a9fe434a855584ea3e733db4433a681a
parent2c6590451f7024190c45693daad7d926ba5541ec (diff)
downloadwww-bfa61e3cf2e0d4adab0c81e0b0961f4aed1cb1e9.tar.gz
www-bfa61e3cf2e0d4adab0c81e0b0961f4aed1cb1e9.zip
refactor install page; minor fixes
-rw-r--r--static/styles.sass5
-rw-r--r--template/engage.html.j229
-rw-r--r--template/index.html.j24
-rw-r--r--template/install.html.j245
4 files changed, 34 insertions, 49 deletions
diff --git a/static/styles.sass b/static/styles.sass
index 285a9bc2..53fb7edc 100644
--- a/static/styles.sass
+++ b/static/styles.sass
@@ -163,9 +163,12 @@ i.red
163 background-color: #678 163 background-color: #678
164 border-color: #68a 164 border-color: #68a
165 165
166img.distro-logo
167 height: 150px
168
166a.btn:hover 169a.btn:hover
167 transition: background-color 0.7s 170 transition: background-color 0.7s
168 background-color: #d00 171 background-color: #217fae
169 border-color: #fff 172 border-color: #fff
170 color: white !important 173 color: white !important
171 174
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index bf9edf48..75b6bdd5 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -9,9 +9,6 @@
9 </div> 9 </div>
10 </div> 10 </div>
11 <div class="container"> 11 <div class="container">
12
13<!-- OBEN LINKS -->
14
15 <div class="row"> 12 <div class="row">
16 <div class="col-lg-5"> 13 <div class="col-lg-5">
17 <h2>Join the conversation!</h2> 14 <h2>Join the conversation!</h2>
@@ -46,8 +43,6 @@
46 </p> 43 </p>
47 </div> 44 </div>
48 45
49<!-- OBEN RECHTS -->
50
51 <div class="col-lg-5 offset-md-1"> 46 <div class="col-lg-5 offset-md-1">
52 <h2>Install GNUnet!</h2> 47 <h2>Install GNUnet!</h2>
53 <p> 48 <p>
@@ -77,9 +72,6 @@
77 </div> 72 </div>
78 </div> 73 </div>
79 74
80
81<!-- MITTE LINKS ^ -->
82
83 <div class="row"> 75 <div class="row">
84 <div class="col-lg-5"> 76 <div class="col-lg-5">
85 <h2>Bibliography</h2> 77 <h2>Bibliography</h2>
@@ -88,9 +80,6 @@
88 <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="https://gnunet.org/en/video">videos</a> of our talks at conferences.</p>
89 </div> 81 </div>
90 82
91
92<!-- MITTE RECHTS -->
93
94 <div class="col-lg-5 offset-md-1"> 83 <div class="col-lg-5 offset-md-1">
95 <h2>Get together!</h2> 84 <h2>Get together!</h2>
96 <p> 85 <p>
@@ -104,20 +93,6 @@
104 </p> 93 </p>
105 </div> 94 </div>
106 </div> 95 </div>
107 96 </div>
108 <!-- TEMPLATE 97</article>
109
110 <div class="row">
111 <div class="col-lg-5">
112 </div>
113 <!-- UNTEN LINKS ^ -->
114 <div class="col-lg-5 offset-md-1">
115 </div>
116 <!-- UNTEN RECHTS ^ -->
117 </div>
118
119 -->
120
121 </div>
122 </article>
123{% endblock body_content %} 98{% endblock body_content %}
diff --git a/template/index.html.j2 b/template/index.html.j2
index d414006d..58f1622e 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -47,11 +47,15 @@
47 About 47 About
48 {% endtrans %} 48 {% endtrans %}
49 </a> 49 </a>
50 &nbsp;
51 &nbsp;
50 <a class="btn btn-primary btn-lg" href="install.html"> 52 <a class="btn btn-primary btn-lg" href="install.html">
51 {% trans %} 53 {% trans %}
52 Install 54 Install
53 {% endtrans %} 55 {% endtrans %}
54 </a> 56 </a>
57 &nbsp;
58 &nbsp;
55 <a class="btn btn-primary btn-lg" href="engage.html"> 59 <a class="btn btn-primary btn-lg" href="engage.html">
56 {% trans %} 60 {% trans %}
57 Join 61 Join
diff --git a/template/install.html.j2 b/template/install.html.j2
index 79c9903a..1471f05d 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -9,16 +9,16 @@
9 </div> 9 </div>
10 </div> 10 </div>
11 <div class="row"> 11 <div class="row">
12 <div class="col-lg-4 offset-md-2"> 12 <div class="col-lg-4 offset-lg-2 col-md-6">
13 {% trans %} 13 {% trans %}
14 <p>The following GNUnet installation instructions help you building from source for your distribution.</p> 14 <p>The following GNUnet installation instructions help you building from source for your distribution.</p>
15 <p><i>Please note that the installation process will get much easier once we have proper packages again (planned for winter 2019).</i></p> 15 <p><i>Please note that the installation process will get much easier once we have proper packages again (planned for winter 2019).</i></p>
16 {% endtrans %} 16 {% endtrans %}
17 </div> 17 </div>
18 <div class="col-lg-4"> 18 <div class="col-lg-4 col-md-6">
19 {% trans %} 19 {% trans %}
20 <p>Once the installation is done, please head over to the <a href="https://gnunet.org/en/use">"How to use GNUnet"-page</a> to get a brief intro on what can be done with your installation.</p> 20 <p>You have already installed GNUnet and want to use it? <a href="https://gnunet.org/en/use">Check this out!</a></p>
21 <p>Further information is available in our <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">handbook</a>.</p> 21 <p>Further information is available in our <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">handbook</a>.</p>
22 <p>If you have any queries about the installation or the usage, please <a href="https://gnunet.org/en/engage.html">get in touch!</a></p> 22 <p>If you have any queries about the installation or the usage, please <a href="https://gnunet.org/en/engage.html">get in touch!</a></p>
23 {% endtrans %} 23 {% endtrans %}
24 </div> 24 </div>
@@ -27,37 +27,40 @@
27 27
28<div class="container"> 28<div class="container">
29 <div class="row"> 29 <div class="row">
30 <div class="col-lg-6 text-center"> 30 <div class="col-lg-4 offset-lg-2 col-md-6 text-center">
31 IMAGE here<br> 31 <p><a href="install-on-ubuntu1804.html"><img src="{{ url('static/images/ubuntu-logo32.png') }}" class="distro-logo"></a></p>
32 <a href="install-on-ubuntu1804.html">Ubuntu 18.04</a> 32 <h3>Ubuntu 18.04</h3>
33 </div> 33 </div>
34 <div class="col-lg-6 text-center"> 34 <div class="col-lg-4 col-md-6 text-center">
35 IMAGE here<br> 35 <p><a href="install-on-debian9.html"><img src="{{ url('static/images/debian-logo.svg') }}" class="distro-logo"></a></p>
36 <a href="install-on-debian9.html">Debian 9</a> 36 <h3>Debian 9</h3>
37 </div> 37 </div>
38 </div> 38 </div>
39</div> 39</div>
40<div class="container"> 40<div class="container">
41 <div class="row"> 41 <div class="row">
42 <div class="col-lg-6 text-center"> 42 <div class="col-lg-4 offset-lg-2 col-md-6 text-center">
43 IMAGE here<br> 43 <p><a href="install-on-macos.html"><img src="{{ url('static/images/apple-logo.svg') }}" class="distro-logo"></a></p>
44 <a href="install-on-macos.html">macOS</a> 44 <h3>macOS</h3>
45 </div> 45 </div>
46 <div class="col-lg-6 text-center"> 46 <div class="col-lg-4 col-md-6 text-center">
47 IMAGE here<br> 47 <p><a href="install-on-netbsd.html"><img src="{{ url('static/images/netbsd-logo.png') }}" class="distro-logo"></a></p>
48 <a href="install-on-netbsd.html">NetBSD</a> 48 <h3>NetBSD</h3>
49 </div> 49 </div>
50 </div> 50 </div>
51</div> 51</div>
52<div class="container"> 52<div class="container">
53 <div class="row"> 53 <div class="row">
54 <div class="col-lg-6 text-center"> 54 <div class="col-lg-4 offset-lg-2 col-md-6 text-center">
55 IMAGE here<br> 55 <p><a href="install-on-archpi.html"><img src="{{ url('static/images/archlinux-logo.svg') }}" class="distro-logo" style="width:300px;height:auto"></a></p>
56 <a href="https://tutorial.gnunet.org/">C Coding Tutorial for GNUnet</a> 56 <h3>Arch-Pi</h3>
57 </div> 57 </div>
58 <div class="col-lg-6 text-center"> 58 <!--
59 <a href="install-on-archpi.html">Arch-Pi</a> 59 <div class="col-lg-4 col-md-6 text-center">
60 <p><a href="https://tutorial.gnunet.org/"><img src="{{ url('static/images/gnunet-logo-dark-text.png') }}" class="distro-logo" alt="GNUnet" /></a></p>
61 <h3>C Coding Tutorial for GNUnet</h3>
60 </div> 62 </div>
63 -->
61 </div> 64 </div>
62</div> 65</div>
63 66