diff options
author | ng0 <ng0@n0.is> | 2019-03-13 23:57:33 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-03-13 23:57:33 +0000 |
commit | a04f0130aeb0498b72b694ea997f19a68d0223e1 (patch) | |
tree | fce18e10869211ca6cd2e11dfaa7bf2e7c7f1ce9 | |
parent | 5c591227e9a0e6e11199f8fdf1b025544e2321d4 (diff) | |
download | www-a04f0130aeb0498b72b694ea997f19a68d0223e1.tar.gz www-a04f0130aeb0498b72b694ea997f19a68d0223e1.zip |
attempt to fix hamburger, 234109th
-rw-r--r-- | common/navigation.j2.inc | 70 |
1 files changed, 45 insertions, 25 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index e820d070..53d52684 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc | |||
@@ -1,37 +1,47 @@ | |||
1 | <!-- | 1 | <!-- |
2 | <div id="header" class=""> | 2 | <div id="header" class=""> |
3 | <ul class="skip"> | 3 | <ul class="skip"> |
4 | <li><a href="#nav">jump to main navigation</a></li> | 4 | <li><a href="#nav">jump to main navigation</a></li> |
5 | <li><a href="#content">jump to main content</a></li> | 5 | <li><a href="#content">jump to main content</a></li> |
6 | <li><a href="#footer">jump to footer</a></li> | 6 | <li><a href="#footer">jump to footer</a></li> |
7 | </ul> | 7 | </ul> |
8 | </div> | 8 | </div> |
9 | --> | 9 | --> |
10 | <noscript> | 10 | <noscript> |
11 | <style> | 11 | <style> |
12 | .collapse | 12 | .collapse |
13 | { | 13 | { |
14 | display: block; | 14 | display: block; |
15 | } | 15 | } |
16 | </style> | 16 | </style> |
17 | </noscript> | 17 | </noscript> |
18 | <nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-inverse navbar-dark fixed-top bg-dark"> | 18 | <nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-inverse navbar-dark fixed-top bg-dark"> |
19 | <a class="navbar-brand" href="index.html"> | 19 | <a class="navbar-brand" href="index.html"> |
20 | <!-- | 20 | <!-- |
21 | TODO: imo this is bad in the navbar. a readable "gnunet" font-logo would | 21 | TODO: imo this is bad in the navbar. |
22 | be better for orientation. | 22 | a readable "gnunet" font-logo would |
23 | be better for orientation. | ||
23 | --> | 24 | --> |
24 | <img src="{{ url('static/images/gnunet-icon.png') }}" alt="GNUnet Home Icon" /> | 25 | <img src="{{ url('static/images/gnunet-icon.png') }}" alt="GNUnet Home Icon" /> |
25 | <!-- <img width="70%" height="70%" src="../static/images/gnunet-logo-dark-only-text.svg" alt="" /> --> | 26 | <!-- <img width="70%" height="70%" src="../static/images/gnunet-logo-dark-only-text.svg" alt="" /> --> |
26 | </a> | 27 | </a> |
27 | <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarMain" aria-controls="navbarMain" aria-expanded="false" aria-label="Toggle navigation"> | 28 | <button class="navbar-toggler navbar-toggler-right custom-toggler" |
29 | type="button" | ||
30 | data-toggle="collapse" | ||
31 | data-target="#navbarMain" | ||
32 | aria-controls="navbarMain" | ||
33 | aria-expanded="false" | ||
34 | aria-label="Toggle navigation"> | ||
28 | <span class="navbar-toggler-icon"></span> | 35 | <span class="navbar-toggler-icon"></span> |
29 | </button> | 36 | </button> |
30 | <div class="collapse navbar-collapse" id="navbarMain"> | 37 | <div class="collapse navbar-collapse" id="navbarMain"> |
31 | <ul class="navbar-nav mr-auto"> | 38 | <ul class="navbar-nav mr-auto"> |
32 | <li class="nav-item dropdown"> | 39 | <li class="nav-item dropdown"> |
33 | <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Community") }}</a> | 40 | <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" |
34 | <ul class="dropdown-menu" aria-labelledby="navbarDropdown"> | 41 | role="button" aria-haspopup="true" aria-expanded="false"> |
42 | {{ _("Community") }} | ||
43 | </a> | ||
44 | <ul class="dropdown-menu" aria-labelledby="navbarMain"> | ||
35 | <li><a class="dropdown-item" href="engage.html">{{ _("Discussion") }} </a></li> | 45 | <li><a class="dropdown-item" href="engage.html">{{ _("Discussion") }} </a></li> |
36 | <li><a class="dropdown-item" href="copyright.html">{{ _("Copyright for Contributors") }} </a></li> | 46 | <li><a class="dropdown-item" href="copyright.html">{{ _("Copyright for Contributors") }} </a></li> |
37 | <li><a class="dropdown-item" href="ev.html">{{ _("GNUnet e.V.") }}</a></li> | 47 | <li><a class="dropdown-item" href="ev.html">{{ _("GNUnet e.V.") }}</a></li> |
@@ -39,8 +49,12 @@ | |||
39 | </ul> | 49 | </ul> |
40 | </li> | 50 | </li> |
41 | <li class="nav-item dropdown"> | 51 | <li class="nav-item dropdown"> |
42 | <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Development") }}</a> | 52 | <a class="nav-link dropdown-toggle" href="#" id="navbarMain" |
43 | <ul class="dropdown-menu" aria-labelledby="navbarDropdown"> | 53 | data-toggle="dropdown" role="button" |
54 | aria-haspopup="true" aria-expanded="false"> | ||
55 | {{ _("Development") }} | ||
56 | </a> | ||
57 | <ul class="dropdown-menu" aria-labelledby="navbarMain"> | ||
44 | <li><a class="dropdown-item" href="architecture.html">{{ _("System Architecture") }}</a></li> | 58 | <li><a class="dropdown-item" href="architecture.html">{{ _("System Architecture") }}</a></li> |
45 | <li><a class="dropdown-item" href="https://bugs.gnunet.org/my_view_page.php">{{ _("Bug Tracker") }}</a></li> | 59 | <li><a class="dropdown-item" href="https://bugs.gnunet.org/my_view_page.php">{{ _("Bug Tracker") }}</a></li> |
46 | <li><a class="dropdown-item" target="_blank" href="https://git.gnunet.org">{{ _("Source Code") }}</a></li> | 60 | <li><a class="dropdown-item" target="_blank" href="https://git.gnunet.org">{{ _("Source Code") }}</a></li> |
@@ -57,7 +71,7 @@ | |||
57 | aria-expanded="false"> | 71 | aria-expanded="false"> |
58 | {{ _("Documentation") }} | 72 | {{ _("Documentation") }} |
59 | </a> | 73 | </a> |
60 | <ul class="dropdown-menu" aria-labelledby="navbarDropdown"> | 74 | <ul class="dropdown-menu" aria-labelledby="navbarMain"> |
61 | <li><a class="dropdown-item" href="tutorial.html">{{ _("Tutorials") }}</a></li> | 75 | <li><a class="dropdown-item" href="tutorial.html">{{ _("Tutorials") }}</a></li> |
62 | <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") }}</a></li> | 76 | <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") }}</a></li> |
63 | <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org">{{ _("Handbook") }}</a></li> | 77 | <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org">{{ _("Handbook") }}</a></li> |
@@ -69,10 +83,16 @@ | |||
69 | </ul> | 83 | </ul> |
70 | <ul class="navbar-nav navbar-right"> | 84 | <ul class="navbar-nav navbar-right"> |
71 | <li class="nav-item dropdown"> | 85 | <li class="nav-item dropdown"> |
72 | <!--<button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> | 86 | <!-- |
73 | <img src="{{ url('static/images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] | 87 | <button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> |
74 | </button> --> | 88 | <img src="{{ url('static/images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] |
75 | <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ lang_full }} [{{ lang }}]</a> | 89 | </button> |
90 | --> | ||
91 | <a class="nav-link dropdown-toggle" href="#" | ||
92 | data-toggle="dropdown" role="button" | ||
93 | aria-haspopup="true" aria-expanded="false"> | ||
94 | {{ lang_full }} [{{ lang }}] | ||
95 | </a> | ||
76 | <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarMain"> | 96 | <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarMain"> |
77 | <li><a class="dropdown-item" href="{{ self_localized('en') }}">English [en]</a></li> | 97 | <li><a class="dropdown-item" href="{{ self_localized('en') }}">English [en]</a></li> |
78 | <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li> | 98 | <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li> |