[tor-commits] [tpo/staging] Add fixes and more
hiro at torproject.org
hiro at torproject.org
Mon Mar 25 17:30:46 UTC 2019
commit ce2c61656a372dee0e5554923ec7e0b3c52ca1fe
Author: hiro <hiro at torproject.org>
Date: Mon Mar 25 18:30:35 2019 +0100
Add fixes and more
---
content/about/contents.lr | 4 ----
templates/download-android.html | 2 +-
templates/footer.html | 4 ++--
templates/hero-download.html | 4 ++--
templates/hero-home.html | 2 +-
templates/navbar.html | 10 +++++-----
templates/pagenav.html | 2 +-
templates/script-download.html | 2 +-
8 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/content/about/contents.lr b/content/about/contents.lr
index a9cbf7c..e43c1a0 100644
--- a/content/about/contents.lr
+++ b/content/about/contents.lr
@@ -9,7 +9,3 @@ color: primary
title: History
---
body:
-
-The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of “onion routing” began in the mid 1990s.
-
-Just like Tor users, the developers, researchers, and funders who’ve made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web.
diff --git a/templates/download-android.html b/templates/download-android.html
index 25fd83c..9630021 100644
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@ -3,7 +3,7 @@
<div class="col-lg-8 py-5 mt-5">
<div class="row">
<div class="oval-2 bg-dark mx-auto">
- <a href="{{ '/download/#android'|url }}">
+ <a href="{{ '/download/#android'|url(alt=this.alt) }}">
<i class="fab fa-android text-light" alt="android" ></i>
</a>
</div>
diff --git a/templates/footer.html b/templates/footer.html
index 4257132..5821295 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -9,7 +9,7 @@
<h2 class="text-white text-bold">{{ _('Download Tor Browser') }}</h2>
<p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p>
{% set download = site.get('/download') %}
- <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download)|url(alt=this.alt) }}">
+ <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download, alt=this.alt) }}">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
</div>
@@ -29,7 +29,7 @@
<li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}>
{% set link = site.get(item.path) %}
{% if link %}
- <a class="nav-link text-light" href="{{ item.path|url }}">
+ <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}">
{% else %}
<a class="nav-link text-light" href="{{ item.path }}">
{% endif %}
diff --git a/templates/hero-download.html b/templates/hero-download.html
index 41ef5d9..6dff1ad 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -35,8 +35,8 @@
</div>
</div>
<div class="row p-5">
- <a class="mx-auto text-white py-3" href="{{ 'languages'|url }}"><u>{{ _('Download in another language') }}</u></a>
- <a class="mx-auto text-white py-3" href="{{ 'options'|url }}"><u>{{ _('Advanced Install Options') }}</u></a>
+ <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language') }}</u></a>
+ <a class="mx-auto text-white py-3" href="{{ 'options'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a>
</div>
<div class="hidden-sm row p-5 justify-content-center window-bg">
<a class="mx-auto text-white text-center py-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a>
diff --git a/templates/hero-home.html b/templates/hero-home.html
index 8bb8624..9d5d7de 100644
--- a/templates/hero-home.html
+++ b/templates/hero-home.html
@@ -9,7 +9,7 @@
</div>
<div class="row col-12 p-5 mx-auto justify-content-center">
{% set download = site.get('/download') %}
- <a class="btn btn-lg btn-outline-light" href="{{ this.url_to(download) }}">
+ <a class="btn btn-lg btn-outline-light" href="{{ this.url_to(download, alt=this.alt) }}">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
</div>
diff --git a/templates/navbar.html b/templates/navbar.html
index 4ba1148..d7e1844 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -5,12 +5,12 @@
<div class="container bg-dark">
<nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-dark p-4">
{% endif %}
- <a class="navbar-brand col-sm-3 col-1" href="/">
+ <a class="navbar-brand" href="/">
<img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo.svg'|asseturl }}" >
<span class="sr-only">Tor Logo</span>
</a>
<label for="nav-toggle">
- <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+ <a class="btn btn-lg btn-primary navbar-toggler text-white p-3 col-1" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
{{ _("Menu") }} <span class="navbar-toggler-icon ml-1"></span>
</a>
</label>
@@ -23,7 +23,7 @@
<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 }}">
+ <a class="nav-link" href="{{ item.path|url(alt=this.alt) }}">
{% else %}
<a class="nav-link" href="{{ item.path }}">
{% endif %}
@@ -36,7 +36,7 @@
{% endfor %}
</ul>
</div>
- <div class="btn-group col-lg-2 col-12">
+ <div class="btn-group pull-right">
{% if this.color == 'primary' %}
<button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% else %}
@@ -53,7 +53,7 @@
</div>
</div>
{% set download = site.get('/download') %}
- <div class="col-lg-2 col-12">
+ <div class="pull-right">
<a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
diff --git a/templates/pagenav.html b/templates/pagenav.html
index 84e2794..1993909 100644
--- a/templates/pagenav.html
+++ b/templates/pagenav.html
@@ -6,7 +6,7 @@
{% for id, item in bag(menubag).items() %}
<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) }}
+ <a class="nav-link" href="{{ this.url_to(item_path, alt=this.alt) }}">{{ _(item.label) }}
{% if this.path == '/' + item.path %}
<span class="sr-only">(current)</span>
{% endif %}
diff --git a/templates/script-download.html b/templates/script-download.html
index 51fcc08..cb341ec 100644
--- a/templates/script-download.html
+++ b/templates/script-download.html
@@ -7,7 +7,7 @@ $(".downloadLink").click(
window.open( $(this).attr("href") );
//redirect current page to success page
- window.location="{{ '/thank-you'|url }}";
+ window.location="{{ '/thank-you'|url(alt=this.alt) }}";
window.focus();
}
);
More information about the tor-commits
mailing list