Start download page and clean up code

This commit is contained in:
hiro 2018-12-13 16:27:19 +01:00
parent cee43409b9
commit d3e3ca2db7
30 changed files with 366 additions and 186 deletions

View File

@ -53,6 +53,10 @@ footer {
}
}
.fade {
opacity: 0.699999988079071;
}
.defend {
color: #FFFFFF;
font-family: Source Sans Pro;

View File

@ -6938,6 +6938,9 @@ footer {
display: block;
padding: 0.4rem 0 !important;
font-size: 1.3rem; } }
.fade {
opacity: 0.699999988079071; }
.defend {
color: #FFFFFF;
font-family: Source Sans Pro;

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,8 @@ _template: jumbotron.html
---
title: Anonymity Online
---
html: home.html
---
body:
######ABOUT US######

View File

@ -6,6 +6,8 @@ _template: jumbotron.html
---
title: Anonymity Online
---
html: home.html
---
body:
######ABOUT US######

View File

@ -6,6 +6,8 @@ _template: jumbotron.html
---
title: Anonymity Online
---
html: home.html
---
body:
######ABOUT US######

View File

@ -6,6 +6,8 @@ _template: jumbotron.html
---
title: Anonymity Online
---
html: home.html
---
body:
######ABOUT US######

View File

@ -0,0 +1,13 @@
_template: jumbotron.html
---
section: download
---
html: download.html
---
color: dark
---
title: download
---
body:
Download

View File

@ -0,0 +1,13 @@
_template: jumbotron.html
---
section: download
---
html: download.html
---
color: dark
---
title: download
---
body:
Download

View File

@ -0,0 +1,13 @@
_template: jumbotron.html
---
section: download
---
html: download.html
---
color: dark
---
title: download
---
body:
Download

View File

@ -0,0 +1,13 @@
_template: jumbotron.html
---
section: download
---
html: download.html
---
color: dark
---
title: download
---
body:
Download

View File

@ -1,19 +1,19 @@
[history]
path = history
path = about/history
label = History
[people]
path = people
path = about/people
label = People
[sponsors]
path = sponsors
path = about/sponsors
label = Sponsors
[reports]
path = reports
path = about/reports
label = Reports
[jobs]
path = jobs
path = about/jobs
label = Jobs

19
databags/platforms+en.ini Normal file
View File

@ -0,0 +1,19 @@
[windows]
path = download/windows
label = Microsoft Windows
[osx]
path = download/osx
label = Apple OS X
[linux]
path = download/linux
label = Linux
[android]
path = download/android
label = Android
[openbsd]
path = download/openbsd
label = OpenBSD

19
databags/platforms+es.ini Normal file
View File

@ -0,0 +1,19 @@
[windows]
path = download/windows
label = Microsoft Windows
[osx]
path = download/osx
label = Apple OS X
[linux]
path = download/linux
label = Linux
[android]
path = download/android
label = Android
[openbsd]
path = download/openbsd
label = OpenBSD

19
databags/platforms+fr.ini Normal file
View File

@ -0,0 +1,19 @@
[windows]
path = download/windows
label = Microsoft Windows
[osx]
path = download/osx
label = Apple OS X
[linux]
path = download/linux
label = Linux
[android]
path = download/android
label = Android
[openbsd]
path = download/openbsd
label = OpenBSD

View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-12 23:23+CET\n"
"POT-Creation-Date: 2018-12-13 16:19+CET\n"
"PO-Revision-Date: 2018-09-19 22:39+CET\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -12,19 +12,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/about.html:7 templates/home.html:8 templates/layout.html:7
#: templates/about.html:7 templates/homepage.html:8 templates/layout.html:7
msgid "Tor Project"
msgstr ""
#: templates/footer.html:9 templates/hero.html:15 templates/navbar.html:50
#: templates/footer.html:10 templates/hero-download.html:40
#: templates/hero-home.html:13 templates/navbar.html:57
msgid "Download Tor Browser"
msgstr "Download Tor Browser"
#: templates/footer.html:18
#: templates/footer.html:19
msgid "Our mission:"
msgstr "Our mission:"
#: templates/footer.html:18
#: templates/footer.html:19
msgid ""
"to advance human rights and freedoms by creating and deploying free and open "
"source anonymity and privacy technologies, supporting their unrestricted "
@ -36,15 +37,15 @@ msgstr ""
"availability and use, and furthering their scientific and popular "
"understanding."
#: templates/footer.html:37
#: templates/footer.html:38
msgid "Subscribe to our Newsletter"
msgstr "Subscribe to our Newsletter"
#: templates/footer.html:38
#: templates/footer.html:39
msgid "Get monthly updates and opportunities from the Tor Project"
msgstr "Get monthly updates and opportunities from the Tor Project"
#: templates/footer.html:45
#: templates/footer.html:46
msgid ""
"Trademark, copyright notices, and rules for use by third parties can be "
"found in our "

View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-12 23:23+CET\n"
"POT-Creation-Date: 2018-12-13 16:19+CET\n"
"PO-Revision-Date: 2018-09-24 16:29+0200\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: none\n"
@ -13,19 +13,20 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.11\n"
#: templates/about.html:7 templates/home.html:8 templates/layout.html:7
#: templates/about.html:7 templates/homepage.html:8 templates/layout.html:7
msgid "Tor Project"
msgstr ""
#: templates/footer.html:9 templates/hero.html:15 templates/navbar.html:50
#: templates/footer.html:10 templates/hero-download.html:40
#: templates/hero-home.html:13 templates/navbar.html:57
msgid "Download Tor Browser"
msgstr "Bajarse el navegador Tor"
#: templates/footer.html:18
#: templates/footer.html:19
msgid "Our mission:"
msgstr "Nuestra misión"
#: templates/footer.html:18
#: templates/footer.html:19
msgid ""
"to advance human rights and freedoms by creating and deploying free and open "
"source anonymity and privacy technologies, supporting their unrestricted "
@ -37,15 +38,15 @@ msgstr ""
"abierto, el apoyo a su disponibilidad y utilización sin restricciones y el "
"fomento de su comprensión científica y popular."
#: templates/footer.html:37
#: templates/footer.html:38
msgid "Subscribe to our Newsletter"
msgstr "Suscribirse a nuestra lista de correo"
#: templates/footer.html:38
#: templates/footer.html:39
msgid "Get monthly updates and opportunities from the Tor Project"
msgstr "Recibir noticias mensuales y oportunidades del Proyecto Tor"
#: templates/footer.html:45
#: templates/footer.html:46
msgid ""
"Trademark, copyright notices, and rules for use by third parties can be "
"found in our "

View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-12 23:23+CET\n"
"POT-Creation-Date: 2018-12-13 16:19+CET\n"
"PO-Revision-Date: 2018-09-21 17:05+0200\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: none\n"
@ -13,19 +13,20 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 1.8.11\n"
#: templates/about.html:7 templates/home.html:8 templates/layout.html:7
#: templates/about.html:7 templates/homepage.html:8 templates/layout.html:7
msgid "Tor Project"
msgstr ""
#: templates/footer.html:9 templates/hero.html:15 templates/navbar.html:50
#: templates/footer.html:10 templates/hero-download.html:40
#: templates/hero-home.html:13 templates/navbar.html:57
msgid "Download Tor Browser"
msgstr "Télécharger le Navigateur Tor"
#: templates/footer.html:18
#: templates/footer.html:19
msgid "Our mission:"
msgstr "Notre mission :"
#: templates/footer.html:18
#: templates/footer.html:19
msgid ""
"to advance human rights and freedoms by creating and deploying free and open "
"source anonymity and privacy technologies, supporting their unrestricted "
@ -38,15 +39,15 @@ msgstr ""
"sans restriction, et promouvons une meilleure compréhension scientifique et "
"populaire."
#: templates/footer.html:37
#: templates/footer.html:38
msgid "Subscribe to our Newsletter"
msgstr "Abonnez-vous à notre liste de diffusion"
#: templates/footer.html:38
#: templates/footer.html:39
msgid "Get monthly updates and opportunities from the Tor Project"
msgstr "Recevez les mises à jours et opportunités mensuelles du Projet Tor"
#: templates/footer.html:45
#: templates/footer.html:46
msgid ""
"Trademark, copyright notices, and rules for use by third parties can be "
"found in our "

View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-12 23:30+CET\n"
"POT-Creation-Date: 2018-12-13 16:27+CET\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <LL@li.org>\n"
@ -11,19 +11,20 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: templates/about.html:7 templates/home.html:8 templates/layout.html:7
#: templates/about.html:7 templates/homepage.html:8 templates/layout.html:7
msgid "Tor Project"
msgstr ""
#: templates/footer.html:9 templates/hero.html:15 templates/navbar.html:50
#: templates/footer.html:10 templates/hero-download.html:40
#: templates/hero-home.html:13 templates/navbar.html:57
msgid "Download Tor Browser"
msgstr ""
#: templates/footer.html:18
#: templates/footer.html:19
msgid "Our mission:"
msgstr ""
#: templates/footer.html:18
#: templates/footer.html:19
msgid ""
"to advance human rights and freedoms by creating and deploying free and open "
"source anonymity and privacy technologies, supporting their unrestricted "
@ -31,15 +32,15 @@ msgid ""
"understanding."
msgstr ""
#: templates/footer.html:37
#: templates/footer.html:38
msgid "Subscribe to our Newsletter"
msgstr ""
#: templates/footer.html:38
#: templates/footer.html:39
msgid "Get monthly updates and opportunities from the Tor Project"
msgstr ""
#: templates/footer.html:45
#: templates/footer.html:46
msgid ""
"Trademark, copyright notices, and rules for use by third parties can be "
"found in our "

1
templates/download.html Normal file
View File

@ -0,0 +1 @@

View File

@ -5,7 +5,8 @@
<div class="offset-lx-2 offset-sm-4 mt-5">
<h3 class="text-white text-bold">Download Tor Browser</h3>
<p class="text-white">Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.</p>
<a class="btn text-primary bg-white btn-light pull-right mt-2" href="https://www.torproject.org/download/download-easy.html.en">
{% set download = site.get('/download') %}
<a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download) }}">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
</div>

View File

@ -0,0 +1,45 @@
<div class="row pt-5">
<h1 class="mx-auto display-2 text-white">Defend yourself.</h1>
</div>
<div class="row pt-5">
<h4 class="mx-auto defend text-white">Protect yourself against tracking, surveillance, and censorship. </h1>
</div>
<div class="row col-12 p-5 mx-auto justify-content-center">
<div class="mt-2 btn-group dropdown pr-2">
{% if this.color == 'primary' %}
<button type="button" class="btn btn-primary bg-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% else %}
<button type="button" class="btn btn-dark bg-dark dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% endif %}
Platform
</button>
<div class="dropdown-menu">
{% for id, item in bag('platforms+' + this.alt).items() %}
<a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.label }}</a>
{% endfor %}
</div>
</div>
<div class="mt-2 btn-group dropdown pr-2">
{% if this.color == 'primary' %}
<button type="button" class="btn btn-primary bg-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% else %}
<button type="button" class="btn btn-dark bg-dark dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% endif %}
{{ bag('alternatives', this.alt, 'language') }}
</button>
<div class="dropdown-menu">
{% for id, item in bag('alternatives').items() %}
{% if this.alt != id %}
<a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a>
{% endif %}
{% endfor %}
</div>
</div>
{% set download = site.get('/download') %}
<a class="btn btn-shadow text-white bg-dark" href="{{ this.url_to(download) }}">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
</div>
<div class="row pt-5">
<a class="mx-auto text-white p-5 fade" href=""><u>Read the latest release announcements.</u></a>
</div>

15
templates/hero-home.html Normal file
View File

@ -0,0 +1,15 @@
<div class="row pt-5">
<h1 class="mx-auto display-2 text-white">Browse Privately.</h1>
</div>
<div class="row pt-5">
<h1 class="mx-auto display-2 text-white">Explore Freely.</h1>
</div>
<div class="row pt-5">
<h4 class="mx-auto defend text-white">Defend yourself against tracking and surveillance. Circumnvent censorship.</h1>
</div>
<div class="row col-12 p-5 mx-auto justify-content-center">
{% set download = site.get('/download') %}
<a class="btn btn-lg btn-shadow text-white bg-dark" href="{{ this.url_to(download) }}">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
</div>

View File

@ -1,20 +1,7 @@
<div class="container bg-dark pt-5">
<div class="row">
<div class="col-12 content-center pt-5">
<div class="row pt-5">
<h1 class="mx-auto display-2 text-white">Browse Privately.</h1>
</div>
<div class="row pt-5">
<h1 class="mx-auto display-2 text-white">Explore Freely.</h1>
</div>
<div class="row pt-5">
<h4 class="mx-auto defend text-white">Defend yourself against tracking and surveillance. Circumnvent censorship.</h1>
</div>
<div class="row col-12 p-5 mx-auto justify-content-center">
<a class="btn btn-lg btn-shadow text-white bg-dark" href="https://www.torproject.org/download/download-easy.html.en">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
</div>
{% include 'hero-' + this.html %}
</div>
</div>
</div>

View File

@ -1,33 +1,92 @@
<!doctype html>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}">
<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}">
<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">
<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>
<body class="no-gutters">
<header>
{% include 'navbar.html' %}
</header>
<div class="page">
<div class="container-fluid bg-dark">
<div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}">
{% include 'hero.html' %}
<div class="container pt-5 justify-content-center">
<section>
<div class="container py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-4 order-1">
<div class="oval-2"></div>
</div>
<div class="col-md-8 px-3 order-2">
<div class="card-block px-3">
<h6 class="pt-3 card-title">BLOCK TRACKERS</h6>
<p class="card-text">Tor Browser isolates each website you visit so third-party trackers and ads cant follow you. Any cookies automatically clear when youre done browsing. So will your browsing history.</p>
</div>
</div>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row flex-xl-nowrap">
<main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
{% include 'ilos.html'%}
<div class="container py-3 hero">
{% block body %}{% endblock %}
</section>
<section>
<div class="container py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-4 order-2">
<div class="oval-2 oval-right"></div>
</div>
</main>
<div class="col-md-8 px-3 order-1">
<div class="card-block px-3">
<h6 class="pt-3 card-title">DEFEND AGAINST SURVEILLANCE</h6>
<p class="card-text">Tor Browser prevents someone watching your connection from knowing what websites you visit. All anyone monitoring your browsing habits can see is that youre using Tor.</p>
</div>
</div>
</div>
</div>
</div>
</section>
<section>
<div class="container py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-4 order-1">
<div class="oval-2"></div>
</div>
<div class="col-md-8 px-3 order-2">
<div class="card-block px-3">
<h6 class="pt-3 card-title">RESIST FINGERPRINTING</h6>
<p class="card-text">Tor aims to make all users look the same making it difficult for you to be fingerprinted based on your browser and device information.</p>
</div>
</div>
</div>
</div>
</div>
</section>
<section>
<div class="container py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-4 order-2">
<div class="oval-2 oval-right"></div>
</div>
<div class="col-md-8 px-3 order-1">
<div class="card-block px-3">
<h6 class="pt-3 card-title">MULTI-LAYERED ENCRYPTION</h6>
<p class="card-text">Your traffic is relayed and encrypted three times as it passes over the Tor network. The network is comprised of thousands of volunteer-run servers known as Tor relays. <a href="">Learn more</a>.</p>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
<div class="container-fluid">
<div class="row flex-xl-nowrap">
<div class="mx-auto col-12 py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-3 order-1">
<div class="oval oval-right"></div>
</div>
<div class="col-md-6 px-3 order-2 pt-5">
<div class="card-block px-3 justify-content-center align-bottom pt-5">
<h6 class="pt-3 card-title text-center align-bottom pt-5">BROWSE FREELY</h6>
<p class="card-text text-center align-bottom">With Tor Browser, you are free to access sites your home network may have blocked.</p>
</div>
</div>
<div class="col-md-3 order-3">
<div class="oval"></div>
</div>
</div>
</div>
</div>
</div>
<footer>
{% include 'footer.html' %}
</footer>
</body>
</div>

33
templates/homepage.html Normal file
View File

@ -0,0 +1,33 @@
<!doctype html>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}">
<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}">
<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">
<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>
<body class="no-gutters">
<header>
{% include 'navbar.html' %}
</header>
<div class="page">
<div class="container-fluid bg-dark">
<div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}">
{% include 'hero.html' %}
</div>
</div>
<div class="container-fluid">
<div class="row flex-xl-nowrap">
<main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
{% include this.html %}
<div class="container py-3 hero">
{% block body %}{% endblock %}
</div>
</main>
</div>
</div>
</div>
<footer>
{% include 'footer.html' %}
</footer>
</body>

View File

@ -1,92 +0,0 @@
<div class="container pt-5 justify-content-center">
<section>
<div class="container py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-4 order-1">
<div class="oval-2"></div>
</div>
<div class="col-md-8 px-3 order-2">
<div class="card-block px-3">
<h6 class="pt-3 card-title">BLOCK TRACKERS</h6>
<p class="card-text">Tor Browser isolates each website you visit so third-party trackers and ads cant follow you. Any cookies automatically clear when youre done browsing. So will your browsing history.</p>
</div>
</div>
</div>
</div>
</div>
</section>
<section>
<div class="container py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-4 order-2">
<div class="oval-2 oval-right"></div>
</div>
<div class="col-md-8 px-3 order-1">
<div class="card-block px-3">
<h6 class="pt-3 card-title">DEFEND AGAINST SURVEILLANCE</h6>
<p class="card-text">Tor Browser prevents someone watching your connection from knowing what websites you visit. All anyone monitoring your browsing habits can see is that youre using Tor.</p>
</div>
</div>
</div>
</div>
</div>
</section>
<section>
<div class="container py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-4 order-1">
<div class="oval-2"></div>
</div>
<div class="col-md-8 px-3 order-2">
<div class="card-block px-3">
<h6 class="pt-3 card-title">RESIST FINGERPRINTING</h6>
<p class="card-text">Tor aims to make all users look the same making it difficult for you to be fingerprinted based on your browser and device information.</p>
</div>
</div>
</div>
</div>
</div>
</section>
<section>
<div class="container py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-4 order-2">
<div class="oval-2 oval-right"></div>
</div>
<div class="col-md-8 px-3 order-1">
<div class="card-block px-3">
<h6 class="pt-3 card-title">MULTI-LAYERED ENCRYPTION</h6>
<p class="card-text">Your traffic is relayed and encrypted three times as it passes over the Tor network. The network is comprised of thousands of volunteer-run servers known as Tor relays. <a href="">Learn more</a>.</p>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
<div class="container-fluid">
<div class="row flex-xl-nowrap">
<div class="mx-auto col-12 py-3">
<div class="card border-0">
<div class="row">
<div class="col-md-3 order-1">
<div class="oval oval-right"></div>
</div>
<div class="col-md-6 px-3 order-2 pt-5">
<div class="card-block px-3 justify-content-center align-bottom pt-5">
<h6 class="pt-3 card-title text-center align-bottom pt-5">BROWSE FREELY</h6>
<p class="card-text text-center align-bottom">With Tor Browser, you are free to access sites your home network may have blocked.</p>
</div>
</div>
<div class="col-md-3 order-3">
<div class="oval"></div>
</div>
</div>
</div>
</div>
</div>
</div>

View File

@ -1,4 +1,4 @@
{% extends "home.html" %}
{% extends "homepage.html" %}
{% block body %}
{{ this.body }}
{% endblock %}

View File

@ -20,9 +20,15 @@
<ul class="navbar-nav">
{% set menubag = 'menu+' + this.alt %}
{% for id, item in bag(menubag).items() %}
<li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}>
<a class="nav-link" href="{{ item.path|url }}">{{ item.label }}
{% if this.is_child_of(item.path) %}
<li{% if this.path == item.path %} class="nav-item active" {% else %} class="nav-item"{% endif %}>
{% set link = site.get(item.path) %}
{% if link %}
<a class="nav-link" href="{{ item.path|url }}">
{% else %}
<a class="nav-link" href="{{ item.path }}">
{% endif %}
{{ item.label }}
{% if this.path == item.path %}
<span class="sr-only">(current)</span>
{% endif %}
</a>
@ -46,7 +52,8 @@
{% endfor %}
</div>
</div>
<a class="btn text-primary bg-white btn-light pull-right mt-2" href="https://www.torproject.org/download/download-easy.html.en">
{% set download = site.get('/download') %}
<a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download) }}">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
</div>

View File

@ -4,16 +4,12 @@
<ul class="nav">
{% set menubag = this.section + '+' + this.alt %}
{% for id, item in bag(menubag).items() %}
<li{% if this.path == this.parent.path + '/' + item.path %} class="nav-item active border-active" {% else %} class="nav-item"{% endif %}>
{% if this.parent.path == "/" %}
<a class="nav-link" href="{{ item.path|url}}">{{ item.label }}
{% else %}
{% set link = this.parent.path + "/" + item.path %}
<a class="nav-link" href="{{ link|url }}">{{ item.label }}
{% endif %}
{% if this.path == this.parent.path + '/' + item.path %}
<li{% if this.path == item.path %} class="nav-item active border-active" {% else %} class="nav-item"{% endif %}>
{% set item_path = site.get(item.path) %}
<a class="nav-link" href="{{ this.url_to(item_path) }}">{{ item.label }}
{% if this.path == item.path %}
<span class="sr-only">(current)</span>
{% endif %}
{% endif %}
</a>
</li>
{% endfor %}