commit e8a70de5c79e9ec120982b1867c7408276ec3c8d Author: Pili Guerra <pili@piliguerra.com> Date: Fri Feb 28 20:12:33 2020 +0100 Adding some placeholder content and structure --- content/anti-censorship/bridgedb/contents.lr | 32 +++++++++++++++ content/anti-censorship/contents.lr | 2 +- content/anti-censorship/gettor/contents.lr | 32 +++++++++++++++ .../pluggable-transports/contents.lr | 32 +++++++++++++++ content/network/contents.lr | 4 +- content/network/tor/contents.lr | 32 +++++++++++++++ models/idea.ini | 47 ++++++++++++++++++++++ models/ideas.ini | 33 +++++++++++++++ models/project.ini | 8 ++-- templates/gsoc.html | 2 +- templates/macros/ideas.html | 24 +++++++++++ templates/macros/projects.html | 16 ++------ templates/project-page.html | 0 templates/team-page.html | 29 +++++++++++++ 14 files changed, 274 insertions(+), 19 deletions(-) diff --git a/content/anti-censorship/bridgedb/contents.lr b/content/anti-censorship/bridgedb/contents.lr new file mode 100644 index 0000000..aa40f3b --- /dev/null +++ b/content/anti-censorship/bridgedb/contents.lr @@ -0,0 +1,32 @@ +_model: project +--- +_template: layout.html +--- +html: project-page.html +--- +maintained: True +--- +section: anti-censorship +--- +section_id: anti-censorship +--- +color: primary +--- +key: 1 +--- +languages: +Python +--- +maintainers: +phw +--- +title: BridgeDB +--- +subtitle: + +BridgeDB is a collection of backend servers used to distribute Tor bridges. + +--- +body: + +longer text \ No newline at end of file diff --git a/content/anti-censorship/contents.lr b/content/anti-censorship/contents.lr index c1259a3..5991e26 100644 --- a/content/anti-censorship/contents.lr +++ b/content/anti-censorship/contents.lr @@ -12,7 +12,7 @@ subtitle: The anti-censorship team is a group of Tor people who make Tor reachab --- key: 1 --- -html: training.html +html: team-page.html --- body: diff --git a/content/anti-censorship/gettor/contents.lr b/content/anti-censorship/gettor/contents.lr new file mode 100644 index 0000000..0029e53 --- /dev/null +++ b/content/anti-censorship/gettor/contents.lr @@ -0,0 +1,32 @@ +_model: project +--- +_template: layout.html +--- +html: project-page.html +--- +maintained: True +--- +section: anti-censorship +--- +section_id: anti-censorship +--- +color: primary +--- +key: 1 +--- +languages: +Python +--- +maintainers: +hiro +--- +title: GetTor +--- +subtitle: + +GetTor is a program that presents alternative methods to download Tor Browser, especially when access to Tor Project's official website and mirrors is blocked. + +--- +body: + +longer text \ No newline at end of file diff --git a/content/anti-censorship/pluggable-transports/contents.lr b/content/anti-censorship/pluggable-transports/contents.lr new file mode 100644 index 0000000..ea8c72d --- /dev/null +++ b/content/anti-censorship/pluggable-transports/contents.lr @@ -0,0 +1,32 @@ +_model: project +--- +_template: layout.html +--- +html: project-page.html +--- +maintained: True +--- +section: anti-censorship +--- +section_id: anti-censorship +--- +color: primary +--- +key: 1 +--- +languages: +Go +--- +maintainers: +hiro +--- +title: Pluggable Transports +--- +subtitle: + +Pluggable Transports (PTs) were created to help uses who can't access the Tor network due to some type of censorship against Tor. + +--- +body: + +PTs can transform the Tor traffic flow between the client and the bridge. This way, censors who monitor traffic between the client and the bridge will see innocent-looking transformed traffic instead of the actual Tor traffic. External programs can talk to Tor clients and Tor bridges using the Pluggable Transport API, to make it easier to build interoperable programs. \ No newline at end of file diff --git a/content/network/contents.lr b/content/network/contents.lr index 6eed72a..3a60b37 100644 --- a/content/network/contents.lr +++ b/content/network/contents.lr @@ -12,10 +12,12 @@ subtitle: The Network Team is a group of Tor people who are working on the Tor b --- key: 4 --- -html: training.html +html: team-page.html --- body: Welcome to the Network Team page! +## What we do + The Network Team is a group of Tor people who are working on Tor back-end: the program called tor, the network simulators, the scripts that support directory authorities, onion services, etc. Basically, everything that sends and receives bytes from the network. \ No newline at end of file diff --git a/content/network/tor/contents.lr b/content/network/tor/contents.lr new file mode 100644 index 0000000..b603a90 --- /dev/null +++ b/content/network/tor/contents.lr @@ -0,0 +1,32 @@ +_model: project +--- +_template: layout.html +--- +html: project-page.html +--- +maintained: True +--- +section: network +--- +section_id: network +--- +color: primary +--- +key: 1 +--- +languages: +C +--- +maintainers: +arma +--- +title: Tor +--- +subtitle: + +Something about tor + +--- +body: + +longer text \ No newline at end of file diff --git a/models/idea.ini b/models/idea.ini new file mode 100644 index 0000000..874f6f0 --- /dev/null +++ b/models/idea.ini @@ -0,0 +1,47 @@ +[model] +name = Idea +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/ideas.ini b/models/ideas.ini new file mode 100644 index 0000000..2b46310 --- /dev/null +++ b/models/ideas.ini @@ -0,0 +1,33 @@ +[model] +name = Ideas +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 = idea +order_by = title diff --git a/models/project.ini b/models/project.ini index 6d5f780..a5e7b20 100644 --- a/models/project.ini +++ b/models/project.ini @@ -10,8 +10,8 @@ type = string label = Link type = url -[fields.active] -label = Active +[fields.maintained] +label = Maintained type = boolean [fields.subtitle] @@ -26,8 +26,8 @@ type = string label = body type = markdown -[fields.mentors] -label = Mentors +[fields.maintainers] +label = Maintainers type = strings [fields.languages] diff --git a/templates/gsoc.html b/templates/gsoc.html index 15f388d..a4b7252 100644 --- a/templates/gsoc.html +++ b/templates/gsoc.html @@ -5,7 +5,7 @@ </div> </div> <div class="col-12"> - {% from "macros/projects.html" import render_active %} + {% from "macros/ideas.html" import render_active %} {% for child in this.children.filter(F.active == True).all() %} <div class="row"> {{ render_active(child, this.alt) }} diff --git a/templates/macros/ideas.html b/templates/macros/ideas.html new file mode 100644 index 0000000..a4e2850 --- /dev/null +++ b/templates/macros/ideas.html @@ -0,0 +1,24 @@ +{% macro render_active(item, alternative) %} +<div class="card border-0"> + <div class="card-header bg-white border-0" id="headingOne"> + <h5 class="mb-0"> + <a href="{{ item.path|url }}">{{ item.title }}</a> + </h5> + Languages: + {% for lang in item.languages %} + <span class="badge badge-primary">{{ lang }}</span> + {% endfor %} + <br> + Mentors: + {% for person in item.mentors %} + <span class="badge badge-secondary">{{ person }}</span> + {% endfor %} + </div> + <div> + <div class="card-body"> + {{ item.subtitle }} + <a href="{{ item.path|url }}">{{ _('Read more.') }}</a> + </div> + </div> +</div> +{% endmacro %} diff --git a/templates/macros/projects.html b/templates/macros/projects.html index a4e2850..78d45c0 100644 --- a/templates/macros/projects.html +++ b/templates/macros/projects.html @@ -1,24 +1,16 @@ {% macro render_active(item, alternative) %} -<div class="card border-0"> - <div class="card-header bg-white border-0" id="headingOne"> +<div class="row border-bottom my-3"> + <div class="col-4"> <h5 class="mb-0"> <a href="{{ item.path|url }}">{{ item.title }}</a> </h5> - Languages: {% for lang in item.languages %} <span class="badge badge-primary">{{ lang }}</span> {% endfor %} <br> - Mentors: - {% for person in item.mentors %} - <span class="badge badge-secondary">{{ person }}</span> - {% endfor %} </div> - <div> - <div class="card-body"> - {{ item.subtitle }} - <a href="{{ item.path|url }}">{{ _('Read more.') }}</a> - </div> + <div class="col-8"> + <p>{{ item.subtitle }}</p> </div> </div> {% endmacro %} diff --git a/templates/project-page.html b/templates/project-page.html new file mode 100644 index 0000000..e69de29 diff --git a/templates/team-page.html b/templates/team-page.html new file mode 100644 index 0000000..7b26134 --- /dev/null +++ b/templates/team-page.html @@ -0,0 +1,29 @@ +<div class="container py-5"> + <div class="row py-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 py-5 mx-auto"> + <h3 class="display-4 text-primary text-left mx-auto">{{ _('Projects') }}</h3> + <div class="col-12"> + {% from "macros/projects.html" import render_active %} + {% for child in this.children.filter(F.maintained == True).all() %} + {{ render_active(child, this.alt) }} + {% endfor %} + </div> + </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Join our Mailing List') }}</h2> + <p class="text-center"> + {{ _('Some Text.')}} + </p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev"> + {{ _('Tor developers mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> +</div> \ No newline at end of file