[tor-commits] [dev/staging] First content skeleton

hiro at torproject.org hiro at torproject.org
Tue Nov 24 17:59:15 UTC 2020


commit a074e41776ea010b6ef5fb4f1ee6c7b7a8c08ceb
Author: antonela <antonela at torproject.org>
Date:   Wed Jul 22 16:20:58 2020 -0300

    First content skeleton
---
 content/advanced-tor/contents.lr                   | 19 +++++++++
 content/advanced-tor/nyx/contents.lr               | 19 +++++++++
 content/advanced-tor/onion-balance/contents.lr     | 19 +++++++++
 content/contents.lr                                | 11 ++---
 content/fighting-censorship/bridges/contents.lr    | 19 +++++++++
 content/fighting-censorship/contents.lr            | 19 +++++++++
 content/fighting-censorship/get-tor/contents.lr    | 19 +++++++++
 content/fighting-censorship/ooni/contents.lr       | 19 +++++++++
 .../pluggable-transports/contents.lr               | 19 +++++++++
 content/hacking-on-tor/contents.lr                 | 19 +++++++++
 content/hacking-on-tor/hacking-tor/contents.lr     | 19 +++++++++
 content/hacking-on-tor/research/contents.lr        | 19 +++++++++
 .../writing-documentation/contents.lr              | 19 +++++++++
 content/observing-tor/contents.lr                  | 19 +++++++++
 content/observing-tor/exitscanner/contents.lr      | 19 +++++++++
 content/observing-tor/metrics/contents.lr          | 19 +++++++++
 content/observing-tor/sbws/contents.lr             | 19 +++++++++
 content/tor-ecosystem/contents.lr                  | 19 +++++++++
 content/tor-ecosystem/onionshare/contents.lr       | 19 +++++++++
 .../tor-ecosystem/tor-browser-android/contents.lr  | 19 +++++++++
 content/tor-ecosystem/tor-browser/contents.lr      | 19 +++++++++
 content/tor-network/contents.lr                    | 19 +++++++++
 content/tor-network/dev-tools/contents.lr          | 19 +++++++++
 content/tor-network/tor-design/contents.lr         | 19 +++++++++
 content/tor-network/tor-protocol/contents.lr       | 19 +++++++++
 content/understanding-tor/contents.lr              | 19 +++++++++
 models/project.ini                                 | 47 ++++++++++++++++++++++
 models/projects.ini                                | 33 +++++++++++++++
 templates/home.html                                | 10 +++++
 templates/homepage.html                            | 26 ------------
 templates/{proejct.html => project.html}           |  2 +-
 templates/section.html                             | 30 ++++++++++++++
 32 files changed, 599 insertions(+), 35 deletions(-)

diff --git a/content/advanced-tor/contents.lr b/content/advanced-tor/contents.lr
new file mode 100644
index 0000000..6660dd6
--- /dev/null
+++ b/content/advanced-tor/contents.lr
@@ -0,0 +1,19 @@
+section: advanced tor
+---
+section_id: advanced-tor
+---
+color: primary
+---
+key: 5
+---
+html: section.html
+---
+cta: Call to Action
+---
+title: Advanced Tor
+---
+subtitle: Managing your tor installation. helpful tools for the advanced relay or onion service operator
+---
+body:
+
+the overview
diff --git a/content/advanced-tor/nyx/contents.lr b/content/advanced-tor/nyx/contents.lr
new file mode 100644
index 0000000..9e39aa8
--- /dev/null
+++ b/content/advanced-tor/nyx/contents.lr
@@ -0,0 +1,19 @@
+section: advanced tor
+---
+section_id: advanced-tor
+---
+color: primary
+---
+image: eye
+---
+key: 1
+---
+html: two-columns-page.html
+---
+title: Nyx
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/advanced-tor/onion-balance/contents.lr b/content/advanced-tor/onion-balance/contents.lr
new file mode 100644
index 0000000..9f39d5a
--- /dev/null
+++ b/content/advanced-tor/onion-balance/contents.lr
@@ -0,0 +1,19 @@
+section: advanced tor
+---
+section_id: advanced-tor
+---
+color: primary
+---
+image: eye
+---
+key: 2
+---
+html: two-columns-page.html
+---
+title: Onion Balance
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/contents.lr b/content/contents.lr
index ad1b646..5466a3f 100644
--- a/content/contents.lr
+++ b/content/contents.lr
@@ -4,17 +4,12 @@ section_id: development
 ---
 color: primary
 ---
-_template: jumbotron.html
+title: The Tor Developers Portal
 ---
-title: The Tor Ecosystem
----
-subtitle: Tor protects you by bounsing your communications around a distributed network of relays run by volunteers all around the world.
+subtitle: a subtitle
 ---
 html: home.html
 ---
 body:
 
-The Tor community is made up of all kinds of contributors.
-Some people write documentation and bug reports, while others hold Tor events and conduct outreach.
-Whether you have a lot of time to volunteer or a little, and whether you consider yourself technical or not, we want you to join our community, too.
-Below you'll find some different ways to volunteer with the Tor community as well as resources to help you help Tor.
+an overview of the portal
diff --git a/content/fighting-censorship/bridges/contents.lr b/content/fighting-censorship/bridges/contents.lr
new file mode 100644
index 0000000..8e166e6
--- /dev/null
+++ b/content/fighting-censorship/bridges/contents.lr
@@ -0,0 +1,19 @@
+section: fighting censorship
+---
+section_id: fighting-censorship
+---
+color: primary
+---
+image: eye
+---
+key: 3
+---
+html: two-columns-page.html
+---
+title: Bridges
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/fighting-censorship/contents.lr b/content/fighting-censorship/contents.lr
new file mode 100644
index 0000000..4515275
--- /dev/null
+++ b/content/fighting-censorship/contents.lr
@@ -0,0 +1,19 @@
+section: fighting censorship
+---
+section_id: fighting-censorship
+---
+color: primary
+---
+key: 4
+---
+html: section.html
+---
+cta: Call to Action
+---
+title: Fighting Censorship
+---
+subtitle: Deliver Tor to censored users
+---
+body:
+
+the overview
diff --git a/content/fighting-censorship/get-tor/contents.lr b/content/fighting-censorship/get-tor/contents.lr
new file mode 100644
index 0000000..22fd086
--- /dev/null
+++ b/content/fighting-censorship/get-tor/contents.lr
@@ -0,0 +1,19 @@
+section: fighting censorship
+---
+section_id: fighting-censorship
+---
+color: primary
+---
+image: eye
+---
+key: 2
+---
+html: two-columns-page.html
+---
+title: Get Tor
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/fighting-censorship/ooni/contents.lr b/content/fighting-censorship/ooni/contents.lr
new file mode 100644
index 0000000..ed56cf4
--- /dev/null
+++ b/content/fighting-censorship/ooni/contents.lr
@@ -0,0 +1,19 @@
+section: fighting censorship
+---
+section_id: fighting-censorship
+---
+color: primary
+---
+image: eye
+---
+key: 4
+---
+html: two-columns-page.html
+---
+title: OONI
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/fighting-censorship/pluggable-transports/contents.lr b/content/fighting-censorship/pluggable-transports/contents.lr
new file mode 100644
index 0000000..2b8fc5d
--- /dev/null
+++ b/content/fighting-censorship/pluggable-transports/contents.lr
@@ -0,0 +1,19 @@
+section: fighting censorship
+---
+section_id: fighting-censorship
+---
+color: primary
+---
+image: eye
+---
+key: 1
+---
+html: two-columns-page.html
+---
+title: Pluggable Transports
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/hacking-on-tor/contents.lr b/content/hacking-on-tor/contents.lr
new file mode 100644
index 0000000..72b729c
--- /dev/null
+++ b/content/hacking-on-tor/contents.lr
@@ -0,0 +1,19 @@
+section: hacking on tor
+---
+section_id: hacking-on-tor
+---
+color: primary
+---
+key: 3
+---
+html: section.html
+---
+cta: Call to Action
+---
+title: Hacking Tor
+---
+subtitle: How can I help?
+---
+body:
+
+the overview
diff --git a/content/hacking-on-tor/hacking-tor/contents.lr b/content/hacking-on-tor/hacking-tor/contents.lr
new file mode 100644
index 0000000..f045089
--- /dev/null
+++ b/content/hacking-on-tor/hacking-tor/contents.lr
@@ -0,0 +1,19 @@
+section: hacking on tor
+---
+section_id: hacking-on-tor
+---
+color: primary
+---
+image: eye
+---
+key: 1
+---
+html: two-columns-page.html
+---
+title: Hacking Tor
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/hacking-on-tor/research/contents.lr b/content/hacking-on-tor/research/contents.lr
new file mode 100644
index 0000000..e3b0075
--- /dev/null
+++ b/content/hacking-on-tor/research/contents.lr
@@ -0,0 +1,19 @@
+section: hacking on tor
+---
+section_id: hacking-on-tor
+---
+color: primary
+---
+image: eye
+---
+key: 3
+---
+html: two-columns-page.html
+---
+title: Research
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/hacking-on-tor/writing-documentation/contents.lr b/content/hacking-on-tor/writing-documentation/contents.lr
new file mode 100644
index 0000000..3e48103
--- /dev/null
+++ b/content/hacking-on-tor/writing-documentation/contents.lr
@@ -0,0 +1,19 @@
+section: hacking on tor
+---
+section_id: hacking-on-tor
+---
+color: primary
+---
+image: eye
+---
+key: 2
+---
+html: two-columns-page.html
+---
+title: Writing documentation
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/observing-tor/contents.lr b/content/observing-tor/contents.lr
new file mode 100644
index 0000000..1710d98
--- /dev/null
+++ b/content/observing-tor/contents.lr
@@ -0,0 +1,19 @@
+section: observing tor
+---
+section_id: observing-tor
+---
+color: primary
+---
+key: 6
+---
+html: section.html
+---
+cta: Call to Action
+---
+title: Observing the Tor network
+---
+subtitle: Tools for researching, inspecting and managing the tor network
+---
+body:
+
+the overview
diff --git a/content/observing-tor/exitscanner/contents.lr b/content/observing-tor/exitscanner/contents.lr
new file mode 100644
index 0000000..33bfd65
--- /dev/null
+++ b/content/observing-tor/exitscanner/contents.lr
@@ -0,0 +1,19 @@
+section: observing tor
+---
+section_id: observing-tor
+---
+color: primary
+---
+image: eye
+---
+key: 2
+---
+html: two-columns-page.html
+---
+title: Exitscanner
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/observing-tor/metrics/contents.lr b/content/observing-tor/metrics/contents.lr
new file mode 100644
index 0000000..6e60a15
--- /dev/null
+++ b/content/observing-tor/metrics/contents.lr
@@ -0,0 +1,19 @@
+section: observing tor
+---
+section_id: observing-tor
+---
+color: primary
+---
+image: eye
+---
+key: 1
+---
+html: two-columns-page.html
+---
+title: Metrics
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/observing-tor/sbws/contents.lr b/content/observing-tor/sbws/contents.lr
new file mode 100644
index 0000000..13843d1
--- /dev/null
+++ b/content/observing-tor/sbws/contents.lr
@@ -0,0 +1,19 @@
+section: observing tor
+---
+section_id: observing-tor
+---
+color: primary
+---
+image: eye
+---
+key: 3
+---
+html: two-columns-page.html
+---
+title: SBWS
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/tor-ecosystem/contents.lr b/content/tor-ecosystem/contents.lr
new file mode 100644
index 0000000..eb5b9d1
--- /dev/null
+++ b/content/tor-ecosystem/contents.lr
@@ -0,0 +1,19 @@
+section: tor ecosystem
+---
+section_id: tor-ecosystem
+---
+color: primary
+---
+key: 6
+---
+html: section.html
+---
+cta: Call To Action
+---
+title: The Tor Ecosystem
+---
+subtitle: Applications that use tor: Ones we maintain, like Tor Browser, and selected others that we love
+---
+body:
+
+the overview
diff --git a/content/tor-ecosystem/onionshare/contents.lr b/content/tor-ecosystem/onionshare/contents.lr
new file mode 100644
index 0000000..dca3c83
--- /dev/null
+++ b/content/tor-ecosystem/onionshare/contents.lr
@@ -0,0 +1,19 @@
+section: tor ecosystem
+---
+section_id: tor-ecosystem
+---
+color: primary
+---
+image: eye
+---
+key: 3
+---
+html: two-columns-page.html
+---
+title: Onionshare
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/tor-ecosystem/tor-browser-android/contents.lr b/content/tor-ecosystem/tor-browser-android/contents.lr
new file mode 100644
index 0000000..8bc0c56
--- /dev/null
+++ b/content/tor-ecosystem/tor-browser-android/contents.lr
@@ -0,0 +1,19 @@
+section: tor ecosystem
+---
+section_id: tor-ecosystem
+---
+color: primary
+---
+image: eye
+---
+key: 2
+---
+html: two-columns-page.html
+---
+title: Tor Browser for Android
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/tor-ecosystem/tor-browser/contents.lr b/content/tor-ecosystem/tor-browser/contents.lr
new file mode 100644
index 0000000..f3cd9fb
--- /dev/null
+++ b/content/tor-ecosystem/tor-browser/contents.lr
@@ -0,0 +1,19 @@
+section: tor ecosystem
+---
+section_id: tor-ecosystem
+---
+color: primary
+---
+image: eye
+---
+key: 1
+---
+html: two-columns-page.html
+---
+title: Tor Browser
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/tor-network/contents.lr b/content/tor-network/contents.lr
new file mode 100644
index 0000000..f44173a
--- /dev/null
+++ b/content/tor-network/contents.lr
@@ -0,0 +1,19 @@
+section: the tor network
+---
+section_id: the-tor-network
+---
+color: primary
+---
+key: 2
+---
+html: section.html
+---
+cta: Call To Action
+---
+title: The Tor Network
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the overview
diff --git a/content/tor-network/dev-tools/contents.lr b/content/tor-network/dev-tools/contents.lr
new file mode 100644
index 0000000..e1cfefe
--- /dev/null
+++ b/content/tor-network/dev-tools/contents.lr
@@ -0,0 +1,19 @@
+section: the tor network
+---
+section_id: the-tor-network
+---
+color: primary
+---
+image: eye
+---
+key: 1
+---
+html: two-columns-page.html
+---
+title: The Tor design
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/tor-network/tor-design/contents.lr b/content/tor-network/tor-design/contents.lr
new file mode 100644
index 0000000..2d6e028
--- /dev/null
+++ b/content/tor-network/tor-design/contents.lr
@@ -0,0 +1,19 @@
+section: the tor network
+---
+section_id: the-tor-network
+---
+color: primary
+---
+image: eye
+---
+key: 2
+---
+html: two-columns-page.html
+---
+title: The Tor design
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/tor-network/tor-protocol/contents.lr b/content/tor-network/tor-protocol/contents.lr
new file mode 100644
index 0000000..adacb92
--- /dev/null
+++ b/content/tor-network/tor-protocol/contents.lr
@@ -0,0 +1,19 @@
+section: the tor network
+---
+section_id: the-tor-network
+---
+color: primary
+---
+image: eye
+---
+key: 3
+---
+html: two-columns-page.html
+---
+title: Development tools used to help make tor
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the content
diff --git a/content/understanding-tor/contents.lr b/content/understanding-tor/contents.lr
new file mode 100644
index 0000000..43ccc6a
--- /dev/null
+++ b/content/understanding-tor/contents.lr
@@ -0,0 +1,19 @@
+section: understanding tor
+---
+section_id: understanding-tor
+---
+color: primary
+---
+key: 1
+---
+html: section.html
+---
+cta: Call To Action
+---
+title: Understanding Tor
+---
+subtitle: a two lines subtitle
+---
+body:
+
+the overview
diff --git a/models/project.ini b/models/project.ini
new file mode 100644
index 0000000..6d5f780
--- /dev/null
+++ b/models/project.ini
@@ -0,0 +1,47 @@
+[model]
+name = Project
+label = {{ this.title }}
+
+[fields.title]
+label = Title
+type = string
+
+[fields.link]
+label = Link
+type = url
+
+[fields.active]
+label = Active
+type = boolean
+
+[fields.subtitle]
+label = Subtitle
+type = markdown
+
+[fields.color]
+label = Color
+type = string
+
+[fields.body]
+label = body
+type = markdown
+
+[fields.mentors]
+label = Mentors
+type = strings
+
+[fields.languages]
+label = Languages
+type = strings
+
+[fields.difficulty]
+label = Difficulty Level
+type = string
+
+[fields.html]
+label = Html
+type = string
+
+[fields.key]
+label = key
+type = string
diff --git a/models/projects.ini b/models/projects.ini
new file mode 100644
index 0000000..c09bf77
--- /dev/null
+++ b/models/projects.ini
@@ -0,0 +1,33 @@
+[model]
+name = Projects
+label = {{ this.title }}
+
+[fields.title]
+label = Title
+type = string
+
+[fields.section]
+label = Section
+type = string
+translate = True
+
+[fields.section_id]
+label = Section_id
+type = string
+translate = False
+
+[fields.body]
+label = Body
+type = markdown
+
+[fields.color]
+label = Color
+type = string
+
+[fields.html]
+label = Html
+type = string
+
+[children]
+model = project
+order_by = title
diff --git a/templates/home.html b/templates/home.html
index 8b6f12f..a4d02ba 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -24,4 +24,14 @@
       </div>
     </div>
   </section>
+<section>
+  <div class="row py-5 text-center mx-auto">
+    <h2 class="display-4 text-primary text-center mx-auto">{{ _('Become a Tor Developer') }}</h2>
+    <p class="text-center">
+      {{ _('Some guidelines here about how to join gitlab and a link to good first issue') }}</p>
+      <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="#">
+            {{ _('Go to the link') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
+      </a>
+  </div>
+</section>
 </div>
diff --git a/templates/homepage.html b/templates/homepage.html
deleted file mode 100644
index 9f7db9e..0000000
--- a/templates/homepage.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!doctype html>
-{% include 'meta.html' %}
-
-<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-{{ this.color }}">
-      <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 %}
-        </main>
-      </div>
-    </div>
-  </div>
-  <footer>
-    {% include 'footer.html' %}
-  </footer>
-</body>
diff --git a/templates/proejct.html b/templates/project.html
similarity index 98%
rename from templates/proejct.html
rename to templates/project.html
index a640059..4f69661 100644
--- a/templates/proejct.html
+++ b/templates/project.html
@@ -1,4 +1,4 @@
-<div class="container py-5">
+}}div class="container py-5">
   <div class="row py-5">
     <div class="col-lg-7">
       {{ this.body }}
diff --git a/templates/section.html b/templates/section.html
new file mode 100644
index 0000000..dbf47a9
--- /dev/null
+++ b/templates/section.html
@@ -0,0 +1,30 @@
+<div class="container py-5">
+  <div class="row pt-5">
+    <div class="col-lg-7">
+      {{ this.body }}
+    </div>
+    <div class="col-lg-5">
+      <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" />
+    </div>
+  </div>
+  <div class="row">
+    {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %}
+      <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3">
+        <div class="card h-100">
+          <div class="card-body">
+            <div class="card-body">
+              <h4 class="card-title text-primary">
+                {% if child._id == "become-tester" %}
+                  <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-qa">{{ _(child.title) }}</a>
+                {% else %}
+                  <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a>
+                {% endif %}
+              </h4>
+              <p class="card-text">{{ _(child.subtitle) }}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    {% endfor %}
+  </div>
+</div>





More information about the tor-commits mailing list