[tor-commits] [tpo/master] Cleaned up repository

hiro at torproject.org hiro at torproject.org
Wed Dec 12 22:30:45 UTC 2018


commit 7cb07c4e461144683c2fbd272c4314557280fba7
Author: hiro <hiro at torproject.org>
Date:   Wed Dec 12 18:30:56 2018 +0100

    Cleaned up repository
---
 content/about/contents+en.lr          |  2 +-
 content/about/contents+es.lr          |  2 +-
 content/about/contents+fr.lr          |  2 +-
 content/about/contents.lr             |  2 +-
 content/about/history/contents+en.lr  |  2 ++
 content/about/history/contents+es.lr  |  2 ++
 content/about/history/contents+fr.lr  |  2 ++
 content/about/history/contents.lr     |  2 ++
 content/about/jobs/contents+en.lr     |  2 ++
 content/about/jobs/contents+es.lr     |  2 ++
 content/about/jobs/contents+fr.lr     |  2 ++
 content/about/jobs/contents.lr        |  2 ++
 content/about/people/contents+en.lr   |  2 ++
 content/about/people/contents+es.lr   |  2 ++
 content/about/people/contents+fr.lr   |  2 ++
 content/about/people/contents.lr      |  2 ++
 content/about/reports/contents+en.lr  |  2 ++
 content/about/reports/contents+es.lr  |  2 ++
 content/about/reports/contents+fr.lr  |  2 ++
 content/about/reports/contents.lr     |  2 ++
 content/about/sponsors/contents+en.lr |  2 ++
 content/about/sponsors/contents+es.lr |  2 ++
 content/about/sponsors/contents+fr.lr |  2 ++
 content/about/sponsors/contents.lr    |  2 ++
 content/contact/contents+en.lr        | 16 ++++++++++------
 content/contact/contents+es.lr        | 16 ++++++++++------
 content/contact/contents+fr.lr        | 16 ++++++++++------
 content/contact/contents.lr           | 16 ++++++++++------
 content/guides/contents+en.lr         | 11 -----------
 content/guides/contents+es.lr         | 11 -----------
 content/guides/contents+fr.lr         | 11 -----------
 content/guides/contents.lr            | 11 -----------
 content/projects/contents+en.lr       | 11 -----------
 content/projects/contents+es.lr       | 11 -----------
 content/projects/contents+fr.lr       | 11 -----------
 content/projects/contents.lr          | 11 -----------
 content/tech/contents+en.lr           | 11 -----------
 content/tech/contents+es.lr           | 11 -----------
 content/tech/contents+fr.lr           | 11 -----------
 content/tech/contents.lr              | 11 -----------
 databags/contact+en.ini               | 19 ------------------
 databags/contact+es.ini               | 19 ------------------
 databags/contact+fr.ini               | 19 ------------------
 databags/guides+en.ini                | 19 ------------------
 databags/guides+es.ini                | 19 ------------------
 databags/guides+fr.ini                | 19 ------------------
 databags/menu+en.ini                  |  4 ++--
 databags/projects+en.ini              | 19 ------------------
 databags/projects+es.ini              | 19 ------------------
 databags/projects+fr.ini              | 19 ------------------
 databags/tech+en.ini                  | 19 ------------------
 databags/tech+es.ini                  | 19 ------------------
 databags/tech+fr.ini                  | 19 ------------------
 databags/topics+en.ini                | 19 ------------------
 databags/topics+es.ini                | 19 ------------------
 databags/topics+fr.ini                | 19 ------------------
 i18n/contents+en.po                   | 10 +++++-----
 i18n/contents+es.po                   | 10 +++++-----
 i18n/contents+fr.po                   | 10 +++++-----
 i18n/contents.pot                     | 10 +++++-----
 templates/about.html                  | 36 +++++++++++++++++++++++++++++++++++
 templates/contact.html                | 35 ++++++++++++++++++++++++++++++++++
 templates/footer.html                 |  2 +-
 templates/guides.html                 | 35 ++++++++++++++++++++++++++++++++++
 templates/header.html                 | 26 +++----------------------
 templates/hero.html                   |  2 +-
 templates/layout.html                 | 16 ++++------------
 templates/navbar.html                 |  2 +-
 templates/pagenav.html                | 23 ++++++++++++++++++++++
 templates/projects.html               | 35 ++++++++++++++++++++++++++++++++++
 templates/tech.html                   | 35 ++++++++++++++++++++++++++++++++++
 71 files changed, 315 insertions(+), 505 deletions(-)

diff --git a/content/about/contents+en.lr b/content/about/contents+en.lr
index 9792c32..de7aa12 100644
--- a/content/about/contents+en.lr
+++ b/content/about/contents+en.lr
@@ -1,4 +1,4 @@
-_template: layout.html
+_template: about.html
 ---
 section: about
 ---
diff --git a/content/about/contents+es.lr b/content/about/contents+es.lr
index 9792c32..de7aa12 100644
--- a/content/about/contents+es.lr
+++ b/content/about/contents+es.lr
@@ -1,4 +1,4 @@
-_template: layout.html
+_template: about.html
 ---
 section: about
 ---
diff --git a/content/about/contents+fr.lr b/content/about/contents+fr.lr
index 9792c32..de7aa12 100644
--- a/content/about/contents+fr.lr
+++ b/content/about/contents+fr.lr
@@ -1,4 +1,4 @@
-_template: layout.html
+_template: about.html
 ---
 section: about
 ---
diff --git a/content/about/contents.lr b/content/about/contents.lr
index 9792c32..de7aa12 100644
--- a/content/about/contents.lr
+++ b/content/about/contents.lr
@@ -1,4 +1,4 @@
-_template: layout.html
+_template: about.html
 ---
 section: about
 ---
diff --git a/content/about/history/contents+en.lr b/content/about/history/contents+en.lr
index 6b4d898..147dbb2 100644
--- a/content/about/history/contents+en.lr
+++ b/content/about/history/contents+en.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: history.html
diff --git a/content/about/history/contents+es.lr b/content/about/history/contents+es.lr
index 6b4d898..147dbb2 100644
--- a/content/about/history/contents+es.lr
+++ b/content/about/history/contents+es.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: history.html
diff --git a/content/about/history/contents+fr.lr b/content/about/history/contents+fr.lr
index 6b4d898..147dbb2 100644
--- a/content/about/history/contents+fr.lr
+++ b/content/about/history/contents+fr.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: history.html
diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr
index 6b4d898..147dbb2 100644
--- a/content/about/history/contents.lr
+++ b/content/about/history/contents.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: history.html
diff --git a/content/about/jobs/contents+en.lr b/content/about/jobs/contents+en.lr
index b9eee7a..c88a206 100644
--- a/content/about/jobs/contents+en.lr
+++ b/content/about/jobs/contents+en.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: jobs.html
diff --git a/content/about/jobs/contents+es.lr b/content/about/jobs/contents+es.lr
index b9eee7a..c88a206 100644
--- a/content/about/jobs/contents+es.lr
+++ b/content/about/jobs/contents+es.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: jobs.html
diff --git a/content/about/jobs/contents+fr.lr b/content/about/jobs/contents+fr.lr
index b9eee7a..c88a206 100644
--- a/content/about/jobs/contents+fr.lr
+++ b/content/about/jobs/contents+fr.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: jobs.html
diff --git a/content/about/jobs/contents.lr b/content/about/jobs/contents.lr
index b9eee7a..c88a206 100644
--- a/content/about/jobs/contents.lr
+++ b/content/about/jobs/contents.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: jobs.html
diff --git a/content/about/people/contents+en.lr b/content/about/people/contents+en.lr
index e760fa8..b7fde02 100644
--- a/content/about/people/contents+en.lr
+++ b/content/about/people/contents+en.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: people.html
diff --git a/content/about/people/contents+es.lr b/content/about/people/contents+es.lr
index e760fa8..b7fde02 100644
--- a/content/about/people/contents+es.lr
+++ b/content/about/people/contents+es.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: people.html
diff --git a/content/about/people/contents+fr.lr b/content/about/people/contents+fr.lr
index e760fa8..b7fde02 100644
--- a/content/about/people/contents+fr.lr
+++ b/content/about/people/contents+fr.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: people.html
diff --git a/content/about/people/contents.lr b/content/about/people/contents.lr
index e760fa8..b7fde02 100644
--- a/content/about/people/contents.lr
+++ b/content/about/people/contents.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: people.html
diff --git a/content/about/reports/contents+en.lr b/content/about/reports/contents+en.lr
index 5b627d2..74847e5 100644
--- a/content/about/reports/contents+en.lr
+++ b/content/about/reports/contents+en.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: reports.html
diff --git a/content/about/reports/contents+es.lr b/content/about/reports/contents+es.lr
index 5b627d2..74847e5 100644
--- a/content/about/reports/contents+es.lr
+++ b/content/about/reports/contents+es.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: reports.html
diff --git a/content/about/reports/contents+fr.lr b/content/about/reports/contents+fr.lr
index 5b627d2..74847e5 100644
--- a/content/about/reports/contents+fr.lr
+++ b/content/about/reports/contents+fr.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: reports.html
diff --git a/content/about/reports/contents.lr b/content/about/reports/contents.lr
index 5b627d2..74847e5 100644
--- a/content/about/reports/contents.lr
+++ b/content/about/reports/contents.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: reports.html
diff --git a/content/about/sponsors/contents+en.lr b/content/about/sponsors/contents+en.lr
index 507783b..4804a04 100644
--- a/content/about/sponsors/contents+en.lr
+++ b/content/about/sponsors/contents+en.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: sponsors.html
diff --git a/content/about/sponsors/contents+es.lr b/content/about/sponsors/contents+es.lr
index 507783b..4804a04 100644
--- a/content/about/sponsors/contents+es.lr
+++ b/content/about/sponsors/contents+es.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: sponsors.html
diff --git a/content/about/sponsors/contents+fr.lr b/content/about/sponsors/contents+fr.lr
index 507783b..4804a04 100644
--- a/content/about/sponsors/contents+fr.lr
+++ b/content/about/sponsors/contents+fr.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: sponsors.html
diff --git a/content/about/sponsors/contents.lr b/content/about/sponsors/contents.lr
index 507783b..4804a04 100644
--- a/content/about/sponsors/contents.lr
+++ b/content/about/sponsors/contents.lr
@@ -1,3 +1,5 @@
+_template: about.html
+---
 section: about
 ---
 html: sponsors.html
diff --git a/content/contact/contents+en.lr b/content/contact/contents+en.lr
index 90d0083..5f852e5 100644
--- a/content/contact/contents+en.lr
+++ b/content/contact/contents+en.lr
@@ -1,11 +1,15 @@
-section: contact
+_template: layout.html
 ---
-title: Contact
+section: the tor project
+---
+html: contact.html
+---
+color: primary
+---
+title: contact
 ---
 body:
 
-This is a list of things:
+<h4 class="text-primary">Get Support <span class="oi oi-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></span></h4>
 
-* Thing 1
-* Thing 2
-* Thing 3
+Need help? Visit our Support Portal for answers to frequently asked questions about connecting to Tor, circumventing censorship, using onion services, and more.
diff --git a/content/contact/contents+es.lr b/content/contact/contents+es.lr
index 90d0083..5f852e5 100644
--- a/content/contact/contents+es.lr
+++ b/content/contact/contents+es.lr
@@ -1,11 +1,15 @@
-section: contact
+_template: layout.html
 ---
-title: Contact
+section: the tor project
+---
+html: contact.html
+---
+color: primary
+---
+title: contact
 ---
 body:
 
-This is a list of things:
+<h4 class="text-primary">Get Support <span class="oi oi-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></span></h4>
 
-* Thing 1
-* Thing 2
-* Thing 3
+Need help? Visit our Support Portal for answers to frequently asked questions about connecting to Tor, circumventing censorship, using onion services, and more.
diff --git a/content/contact/contents+fr.lr b/content/contact/contents+fr.lr
index 90d0083..5f852e5 100644
--- a/content/contact/contents+fr.lr
+++ b/content/contact/contents+fr.lr
@@ -1,11 +1,15 @@
-section: contact
+_template: layout.html
 ---
-title: Contact
+section: the tor project
+---
+html: contact.html
+---
+color: primary
+---
+title: contact
 ---
 body:
 
-This is a list of things:
+<h4 class="text-primary">Get Support <span class="oi oi-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></span></h4>
 
-* Thing 1
-* Thing 2
-* Thing 3
+Need help? Visit our Support Portal for answers to frequently asked questions about connecting to Tor, circumventing censorship, using onion services, and more.
diff --git a/content/contact/contents.lr b/content/contact/contents.lr
index 90d0083..5f852e5 100644
--- a/content/contact/contents.lr
+++ b/content/contact/contents.lr
@@ -1,11 +1,15 @@
-section: contact
+_template: layout.html
 ---
-title: Contact
+section: the tor project
+---
+html: contact.html
+---
+color: primary
+---
+title: contact
 ---
 body:
 
-This is a list of things:
+<h4 class="text-primary">Get Support <span class="oi oi-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></span></h4>
 
-* Thing 1
-* Thing 2
-* Thing 3
+Need help? Visit our Support Portal for answers to frequently asked questions about connecting to Tor, circumventing censorship, using onion services, and more.
diff --git a/content/guides/contents+en.lr b/content/guides/contents+en.lr
deleted file mode 100644
index 02dae02..0000000
--- a/content/guides/contents+en.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: guides
----
-title: Guides
----
-body:
-
-This is a list of things:
-
-* Thing 1
-* Thing 2
-* Thing 3
diff --git a/content/guides/contents+es.lr b/content/guides/contents+es.lr
deleted file mode 100644
index 02dae02..0000000
--- a/content/guides/contents+es.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: guides
----
-title: Guides
----
-body:
-
-This is a list of things:
-
-* Thing 1
-* Thing 2
-* Thing 3
diff --git a/content/guides/contents+fr.lr b/content/guides/contents+fr.lr
deleted file mode 100644
index 02dae02..0000000
--- a/content/guides/contents+fr.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: guides
----
-title: Guides
----
-body:
-
-This is a list of things:
-
-* Thing 1
-* Thing 2
-* Thing 3
diff --git a/content/guides/contents.lr b/content/guides/contents.lr
deleted file mode 100644
index 02dae02..0000000
--- a/content/guides/contents.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: guides
----
-title: Guides
----
-body:
-
-This is a list of things:
-
-* Thing 1
-* Thing 2
-* Thing 3
diff --git a/content/projects/contents+en.lr b/content/projects/contents+en.lr
deleted file mode 100644
index a72b041..0000000
--- a/content/projects/contents+en.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: projects
----
-title: Projects
----
-body:
-
-This is a list of the projects:
-
-* Project 1
-* Project 2
-* Project 3
diff --git a/content/projects/contents+es.lr b/content/projects/contents+es.lr
deleted file mode 100644
index a72b041..0000000
--- a/content/projects/contents+es.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: projects
----
-title: Projects
----
-body:
-
-This is a list of the projects:
-
-* Project 1
-* Project 2
-* Project 3
diff --git a/content/projects/contents+fr.lr b/content/projects/contents+fr.lr
deleted file mode 100644
index a72b041..0000000
--- a/content/projects/contents+fr.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: projects
----
-title: Projects
----
-body:
-
-This is a list of the projects:
-
-* Project 1
-* Project 2
-* Project 3
diff --git a/content/projects/contents.lr b/content/projects/contents.lr
deleted file mode 100644
index a72b041..0000000
--- a/content/projects/contents.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: projects
----
-title: Projects
----
-body:
-
-This is a list of the projects:
-
-* Project 1
-* Project 2
-* Project 3
diff --git a/content/tech/contents+en.lr b/content/tech/contents+en.lr
deleted file mode 100644
index 06fb3eb..0000000
--- a/content/tech/contents+en.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: tech
----
-title: Tech
----
-body:
-
-This is a list of things:
-
-* Thing 1
-* Thing 2
-* Thing 3
diff --git a/content/tech/contents+es.lr b/content/tech/contents+es.lr
deleted file mode 100644
index 06fb3eb..0000000
--- a/content/tech/contents+es.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: tech
----
-title: Tech
----
-body:
-
-This is a list of things:
-
-* Thing 1
-* Thing 2
-* Thing 3
diff --git a/content/tech/contents+fr.lr b/content/tech/contents+fr.lr
deleted file mode 100644
index 06fb3eb..0000000
--- a/content/tech/contents+fr.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: tech
----
-title: Tech
----
-body:
-
-This is a list of things:
-
-* Thing 1
-* Thing 2
-* Thing 3
diff --git a/content/tech/contents.lr b/content/tech/contents.lr
deleted file mode 100644
index 06fb3eb..0000000
--- a/content/tech/contents.lr
+++ /dev/null
@@ -1,11 +0,0 @@
-section: tech
----
-title: Tech
----
-body:
-
-This is a list of things:
-
-* Thing 1
-* Thing 2
-* Thing 3
diff --git a/databags/contact+en.ini b/databags/contact+en.ini
deleted file mode 100644
index 43f44fd..0000000
--- a/databags/contact+en.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about/history
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/contact+es.ini b/databags/contact+es.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/contact+es.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/contact+fr.ini b/databags/contact+fr.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/contact+fr.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/guides+en.ini b/databags/guides+en.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/guides+en.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/guides+es.ini b/databags/guides+es.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/guides+es.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/guides+fr.ini b/databags/guides+fr.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/guides+fr.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/menu+en.ini b/databags/menu+en.ini
index bc90673..01a8760 100644
--- a/databags/menu+en.ini
+++ b/databags/menu+en.ini
@@ -7,7 +7,7 @@ path = https://www.torproject.org/docs/documentation.html.en
 label = Documentation
 
 [press]
-path = https://www.torproject.org/press/press.html.en
+path = /press
 label = Press
 
 [blog]
@@ -19,5 +19,5 @@ path = https://newsletter.torproject.org
 label = Newsletter
 
 [contact]
-path = https://www.torproject.org/about/contact.html.en
+path = /contact
 label = Contact
diff --git a/databags/projects+en.ini b/databags/projects+en.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/projects+en.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/projects+es.ini b/databags/projects+es.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/projects+es.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/projects+fr.ini b/databags/projects+fr.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/projects+fr.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/tech+en.ini b/databags/tech+en.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/tech+en.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/tech+es.ini b/databags/tech+es.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/tech+es.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/tech+fr.ini b/databags/tech+fr.ini
deleted file mode 100644
index b89560e..0000000
--- a/databags/tech+fr.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[history]
-path = about
-label = History
-
-[people]
-path = about/people
-label = People
-
-[sponsors]
-path = about/sponsors
-label = Sponsors
-
-[reports]
-path = about/reports
-label = Reports
-
-[jobs]
-path = about/jobs
-label = Jobs
diff --git a/databags/topics+en.ini b/databags/topics+en.ini
deleted file mode 100644
index a04e812..0000000
--- a/databags/topics+en.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[about]
-path = about
-label = About web docs
-
-[projects]
-path = projects
-label = Projects
-
-[tech]
-path = tech
-label = Tech
-
-[guides]
-path = guides
-label = Guides
-
-[contact]
-path = contact
-label = Contact
diff --git a/databags/topics+es.ini b/databags/topics+es.ini
deleted file mode 100644
index a04e812..0000000
--- a/databags/topics+es.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[about]
-path = about
-label = About web docs
-
-[projects]
-path = projects
-label = Projects
-
-[tech]
-path = tech
-label = Tech
-
-[guides]
-path = guides
-label = Guides
-
-[contact]
-path = contact
-label = Contact
diff --git a/databags/topics+fr.ini b/databags/topics+fr.ini
deleted file mode 100644
index a04e812..0000000
--- a/databags/topics+fr.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[about]
-path = about
-label = About web docs
-
-[projects]
-path = projects
-label = Projects
-
-[tech]
-path = tech
-label = Tech
-
-[guides]
-path = guides
-label = Guides
-
-[contact]
-path = contact
-label = Contact
diff --git a/i18n/contents+en.po b/i18n/contents+en.po
index 3f46ec2..74966f7 100644
--- a/i18n/contents+en.po
+++ b/i18n/contents+en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-12 17:47+CET\n"
+"POT-Creation-Date: 2018-12-12 18:10+CET\n"
 "PO-Revision-Date: 2018-09-19 22:39+CET\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -12,6 +12,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/about.html:7 templates/home.html:7 templates/layout.html:7
+msgid "Tor Project"
+msgstr ""
+
 #: templates/footer.html:9 templates/hero.html:15 templates/navbar.html:50
 msgid "Download Tor Browser"
 msgstr "Download Tor Browser"
@@ -48,10 +52,6 @@ msgstr ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our "
 
-#: templates/home.html:7 templates/layout.html:7
-msgid "Tor Project"
-msgstr ""
-
 #: templates/navbar.html:10
 msgid "Tor Logo"
 msgstr "Tor Logo"
diff --git a/i18n/contents+es.po b/i18n/contents+es.po
index e034747..78f94dc 100644
--- a/i18n/contents+es.po
+++ b/i18n/contents+es.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-12 17:47+CET\n"
+"POT-Creation-Date: 2018-12-12 18:10+CET\n"
 "PO-Revision-Date: 2018-09-24 16:29+0200\n"
 "Last-Translator: emmapeel <emma.peel at riseup.net>\n"
 "Language-Team: none\n"
@@ -13,6 +13,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
+#: templates/about.html:7 templates/home.html:7 templates/layout.html:7
+msgid "Tor Project"
+msgstr ""
+
 #: templates/footer.html:9 templates/hero.html:15 templates/navbar.html:50
 msgid "Download Tor Browser"
 msgstr "Bajarse el navegador Tor"
@@ -49,10 +53,6 @@ msgstr ""
 "Se pueden encontrar, la marca registrada, las notas de derechos de autor, y "
 "las reglas de uso por terceras partes, en nuestra"
 
-#: templates/home.html:7 templates/layout.html:7
-msgid "Tor Project"
-msgstr ""
-
 #: templates/navbar.html:10
 msgid "Tor Logo"
 msgstr "Tor Logo"
diff --git a/i18n/contents+fr.po b/i18n/contents+fr.po
index 455c0cb..eee96c6 100644
--- a/i18n/contents+fr.po
+++ b/i18n/contents+fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-12 17:47+CET\n"
+"POT-Creation-Date: 2018-12-12 18:10+CET\n"
 "PO-Revision-Date: 2018-09-21 17:05+0200\n"
 "Last-Translator: emmapeel <emma.peel at riseup.net>\n"
 "Language-Team: none\n"
@@ -13,6 +13,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
+#: templates/about.html:7 templates/home.html:7 templates/layout.html:7
+msgid "Tor Project"
+msgstr ""
+
 #: templates/footer.html:9 templates/hero.html:15 templates/navbar.html:50
 msgid "Download Tor Browser"
 msgstr "Télécharger le Navigateur Tor"
@@ -48,10 +52,6 @@ msgid ""
 "found in our "
 msgstr ""
 
-#: templates/home.html:7 templates/layout.html:7
-msgid "Tor Project"
-msgstr ""
-
 #: templates/navbar.html:10
 msgid "Tor Logo"
 msgstr "Logo Tor"
diff --git a/i18n/contents.pot b/i18n/contents.pot
index a2881d4..4399381 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-12 17:48+CET\n"
+"POT-Creation-Date: 2018-12-12 18:30+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: en <LL at li.org>\n"
@@ -11,6 +11,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: templates/about.html:7 templates/home.html:7 templates/layout.html:7
+msgid "Tor Project"
+msgstr ""
+
 #: templates/footer.html:9 templates/hero.html:15 templates/navbar.html:50
 msgid "Download Tor Browser"
 msgstr ""
@@ -41,10 +45,6 @@ msgid ""
 "found in our "
 msgstr ""
 
-#: templates/home.html:7 templates/layout.html:7
-msgid "Tor Project"
-msgstr ""
-
 #: templates/navbar.html:10
 msgid "Tor Logo"
 msgstr ""
diff --git a/templates/about.html b/templates/about.html
new file mode 100644
index 0000000..fd486e6
--- /dev/null
+++ b/templates/about.html
@@ -0,0 +1,36 @@
+<!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 }}">
+
+<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>
+<body class="no-gutters">
+  <header>
+    {% include 'navbar.html' %}
+  </header>
+  <div class="page">
+    {% include 'header.html' %}
+    <div class="container-fluid">
+      <div class="row flex-xl-nowrap">
+        <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
+          {% if this.path == "/about/history" %}
+            <div class="container py-3 preamble">
+              {{ this.parent.body }}
+            </div>
+          {% else %}
+            <div class="container py-3 preamble">
+              {{ this.body }}
+            </div>
+          {% endif %}
+          {% if this.parent.path == "/about" %}
+             {% include this.html %}
+          {% endif %}
+        </main>
+      </div>
+    </div>
+  </div>
+  <footer>
+    {% include 'footer.html' %}
+  </footer>
+</body>
diff --git a/templates/contact.html b/templates/contact.html
new file mode 100644
index 0000000..24d2639
--- /dev/null
+++ b/templates/contact.html
@@ -0,0 +1,35 @@
+<div class="container py-3">
+  <div class="row border-bottom border-light"><p></p></div>
+</div>
+</div><div class="container py-3">
+  <h3 class="text-primary display-5">Previous Openings</h3>
+</div>
+<div class="container py-3">
+  <div class="row">
+    <div class="col-5">
+      <ul class="jobs-ul">
+        <li>Executive Director</li>
+        <li>User Research Coordinator</li>
+        <li>Community Liaison</li>
+        <li>Core developer</li>
+        <li>Support assistants and translators</li>
+        <li>Browser hacker</li>
+        <li>Pluggable transport developer</li>
+      </ul>
+    </div>
+    <div class="col-5">
+      <ul class="jobs-ul">
+        <li>Firefox/Thunderbird Extension Developer</li>
+        <li>Director of Communications</li>
+        <li>Executive Administrator</li>
+        <li>Browser Developers for Mobile (Android)</li>
+        <li>Chief Financial and Grants Officer</li>
+        <li>Android OS Developer</li>
+        <li>Fundraising Director</li>
+      </ul>
+    </div>
+  </div>
+  <div class="row">
+    <p>Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff. <a href="">We invite you to join us on IRC to find how you can get involved.</a></p>
+  </div>
+</div>
diff --git a/templates/footer.html b/templates/footer.html
index 726fc2e..43174d7 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -6,7 +6,7 @@
   	        <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">
-              <span class="oi oi-arrow-bottom p-1" title="icon arrow-bottom" aria-hidden="true"></span>{{ _("Download Tor Browser") }}
+              {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
             </a>
         </div>
       </div>
diff --git a/templates/guides.html b/templates/guides.html
new file mode 100644
index 0000000..24d2639
--- /dev/null
+++ b/templates/guides.html
@@ -0,0 +1,35 @@
+<div class="container py-3">
+  <div class="row border-bottom border-light"><p></p></div>
+</div>
+</div><div class="container py-3">
+  <h3 class="text-primary display-5">Previous Openings</h3>
+</div>
+<div class="container py-3">
+  <div class="row">
+    <div class="col-5">
+      <ul class="jobs-ul">
+        <li>Executive Director</li>
+        <li>User Research Coordinator</li>
+        <li>Community Liaison</li>
+        <li>Core developer</li>
+        <li>Support assistants and translators</li>
+        <li>Browser hacker</li>
+        <li>Pluggable transport developer</li>
+      </ul>
+    </div>
+    <div class="col-5">
+      <ul class="jobs-ul">
+        <li>Firefox/Thunderbird Extension Developer</li>
+        <li>Director of Communications</li>
+        <li>Executive Administrator</li>
+        <li>Browser Developers for Mobile (Android)</li>
+        <li>Chief Financial and Grants Officer</li>
+        <li>Android OS Developer</li>
+        <li>Fundraising Director</li>
+      </ul>
+    </div>
+  </div>
+  <div class="row">
+    <p>Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff. <a href="">We invite you to join us on IRC to find how you can get involved.</a></p>
+  </div>
+</div>
diff --git a/templates/header.html b/templates/header.html
index 6639b0a..d4a91c9 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -22,26 +22,6 @@
     </div>
   </div>
 </div>
-<div class="container-fluid  border-bottom border-light">
-  <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}">
-    <div class="row col-12 justify-content-center">
-      <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.is_child_of(item.path) %}
-            <span class="sr-only">(current)</span>
-            {% endif %}
-          </a>
-        </li>
-        {% endfor %}
-      </ul>
-    </div>
-  </div>
-</div>
+{% if this.section == 'about' %}
+  {% include 'pagenav.html' %}
+{% endif %}
diff --git a/templates/hero.html b/templates/hero.html
index 7ff4490..44116f4 100644
--- a/templates/hero.html
+++ b/templates/hero.html
@@ -12,7 +12,7 @@
       </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">
-          <span class="oi oi-arrow-bottom p-1" title="icon arrow-bottom" aria-hidden="true"></span>{{ _("Download Tor Browser") }}
+          {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
         </a>
       </div>
     </div>
diff --git a/templates/layout.html b/templates/layout.html
index fd486e6..a6ae0a5 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -14,18 +14,10 @@
     <div class="container-fluid">
       <div class="row flex-xl-nowrap">
         <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
-          {% if this.path == "/about/history" %}
-            <div class="container py-3 preamble">
-              {{ this.parent.body }}
-            </div>
-          {% else %}
-            <div class="container py-3 preamble">
-              {{ this.body }}
-            </div>
-          {% endif %}
-          {% if this.parent.path == "/about" %}
-             {% include this.html %}
-          {% endif %}
+          <div class="container py-3 preamble">
+            {{ this.body }}
+          </div>
+          {% include this.html %}
         </main>
       </div>
     </div>
diff --git a/templates/navbar.html b/templates/navbar.html
index 33b9856..be9b389 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -47,7 +47,7 @@
         </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">
-        <span class="oi oi-arrow-bottom p-1" title="icon arrow-bottom" aria-hidden="true"></span>{{ _("Download Tor Browser") }}
+        {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
       </a>
     </div>
   </nav>
diff --git a/templates/pagenav.html b/templates/pagenav.html
new file mode 100644
index 0000000..d62b9c6
--- /dev/null
+++ b/templates/pagenav.html
@@ -0,0 +1,23 @@
+<div class="container-fluid  border-bottom border-light">
+  <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}">
+    <div class="row col-12 justify-content-center">
+      <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 %}
+            <span class="sr-only">(current)</span>
+            {% endif %}
+          </a>
+        </li>
+        {% endfor %}
+      </ul>
+    </div>
+  </div>
+</div>
diff --git a/templates/projects.html b/templates/projects.html
new file mode 100644
index 0000000..24d2639
--- /dev/null
+++ b/templates/projects.html
@@ -0,0 +1,35 @@
+<div class="container py-3">
+  <div class="row border-bottom border-light"><p></p></div>
+</div>
+</div><div class="container py-3">
+  <h3 class="text-primary display-5">Previous Openings</h3>
+</div>
+<div class="container py-3">
+  <div class="row">
+    <div class="col-5">
+      <ul class="jobs-ul">
+        <li>Executive Director</li>
+        <li>User Research Coordinator</li>
+        <li>Community Liaison</li>
+        <li>Core developer</li>
+        <li>Support assistants and translators</li>
+        <li>Browser hacker</li>
+        <li>Pluggable transport developer</li>
+      </ul>
+    </div>
+    <div class="col-5">
+      <ul class="jobs-ul">
+        <li>Firefox/Thunderbird Extension Developer</li>
+        <li>Director of Communications</li>
+        <li>Executive Administrator</li>
+        <li>Browser Developers for Mobile (Android)</li>
+        <li>Chief Financial and Grants Officer</li>
+        <li>Android OS Developer</li>
+        <li>Fundraising Director</li>
+      </ul>
+    </div>
+  </div>
+  <div class="row">
+    <p>Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff. <a href="">We invite you to join us on IRC to find how you can get involved.</a></p>
+  </div>
+</div>
diff --git a/templates/tech.html b/templates/tech.html
new file mode 100644
index 0000000..24d2639
--- /dev/null
+++ b/templates/tech.html
@@ -0,0 +1,35 @@
+<div class="container py-3">
+  <div class="row border-bottom border-light"><p></p></div>
+</div>
+</div><div class="container py-3">
+  <h3 class="text-primary display-5">Previous Openings</h3>
+</div>
+<div class="container py-3">
+  <div class="row">
+    <div class="col-5">
+      <ul class="jobs-ul">
+        <li>Executive Director</li>
+        <li>User Research Coordinator</li>
+        <li>Community Liaison</li>
+        <li>Core developer</li>
+        <li>Support assistants and translators</li>
+        <li>Browser hacker</li>
+        <li>Pluggable transport developer</li>
+      </ul>
+    </div>
+    <div class="col-5">
+      <ul class="jobs-ul">
+        <li>Firefox/Thunderbird Extension Developer</li>
+        <li>Director of Communications</li>
+        <li>Executive Administrator</li>
+        <li>Browser Developers for Mobile (Android)</li>
+        <li>Chief Financial and Grants Officer</li>
+        <li>Android OS Developer</li>
+        <li>Fundraising Director</li>
+      </ul>
+    </div>
+  </div>
+  <div class="row">
+    <p>Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff. <a href="">We invite you to join us on IRC to find how you can get involved.</a></p>
+  </div>
+</div>





More information about the tor-commits mailing list