aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2019-06-29 12:02:15 +0200
committerxrs <xrs@mail36.net>2019-06-29 12:02:15 +0200
commitea44b0b72e42e760dabb5f63f19f3f34fba6512b (patch)
tree102b65658b00e20700a6df974a1770797e62c44d
parent79be0d53d75c6320b288f4d5e5bcce823486ffb6 (diff)
downloadwww-ea44b0b72e42e760dabb5f63f19f3f34fba6512b.tar.gz
www-ea44b0b72e42e760dabb5f63f19f3f34fba6512b.zip
add link for news; mv about link
-rw-r--r--common/navigation.j2.inc13
-rw-r--r--template/index.html.j22
2 files changed, 7 insertions, 8 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index d4bcd232..21962aa1 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -20,12 +20,6 @@
20 <!-- <nav class="navbar navbar-expand-md fixed-top"> --> 20 <!-- <nav class="navbar navbar-expand-md fixed-top"> -->
21<nav class="navbar navbar-expand-md bg-near-black"> 21<nav class="navbar navbar-expand-md bg-near-black">
22 <a class="navbar-brand" href="index.html"> 22 <a class="navbar-brand" href="index.html">
23 <!--
24 TODO: imo this is bad in the navbar.
25 a readable "gnunet" font-logo would
26 be better for orientation.
27 -->
28 <!-- <img src="{{ url('static/images/gnunet-icon.png') }}" alt="GNUnet Home Icon" /> -->
29 <img src="{{ url('static/images/gnunet-logo-dark-only-text.png') }}" alt="GNUnet Home Icon" height="25px" /> 23 <img src="{{ url('static/images/gnunet-logo-dark-only-text.png') }}" alt="GNUnet Home Icon" height="25px" />
30 </a> 24 </a>
31 25
@@ -44,6 +38,12 @@
44 <!-- navbar --> 38 <!-- navbar -->
45 <div class="collapse navbar-collapse bg-near-black" id="navbarMain"> 39 <div class="collapse navbar-collapse bg-near-black" id="navbarMain">
46 <ul class="navbar-nav mr-auto nav"> 40 <ul class="navbar-nav mr-auto nav">
41 <li class="nav-link">
42 <a href="about.html">{{ _("About") }}</a></li>
43 </li>
44 <li class="nav-link">
45 <a href="index.html#news">{{ _("News") }}</a>
46 </li>
47 <li class="nav-item dropdown"> 47 <li class="nav-item dropdown">
48 <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" 48 <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown"
49 role="button" aria-haspopup="true" aria-expanded="false"> 49 role="button" aria-haspopup="true" aria-expanded="false">
@@ -81,7 +81,6 @@
81 {{ _("Documentation") }} 81 {{ _("Documentation") }}
82 </a> 82 </a>
83 <ul class="dropdown-menu" aria-labelledby="navbarMain"> 83 <ul class="dropdown-menu" aria-labelledby="navbarMain">
84 <li><a class="dropdown-item" href="about.html">{{ _("About") }}</a></li>
85 <li><a class="dropdown-item" href="install.html">{{ _("Install") }}</a></li> 84 <li><a class="dropdown-item" href="install.html">{{ _("Install") }}</a></li>
86 <li><a class="dropdown-item" href="use.html">{{ _("Use") }}</a></li> 85 <li><a class="dropdown-item" href="use.html">{{ _("Use") }}</a></li>
87 <li><a class="dropdown-item" href="video.html">{{ _("Videos") }}</a></li> 86 <li><a class="dropdown-item" href="video.html">{{ _("Videos") }}</a></li>
diff --git a/template/index.html.j2 b/template/index.html.j2
index 857960c8..dc9e4fbd 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -354,7 +354,7 @@
354<div class="container"> 354<div class="container">
355 <div class="row"> 355 <div class="row">
356 <div class="container text-center"> 356 <div class="container text-center">
357 <h1>{{ _("News") }}</h1> 357 <h1>{{ _("News") }}<a name="news"></a></h1>
358 </div> 358 </div>
359 </div> 359 </div>
360 <div class="row"> 360 <div class="row">