commit c7e7da927b6f8ff8e8b8359f230b0047da0421e0 Author: hiro hiro@torproject.org Date: Thu Jan 30 15:42:56 2020 +0100
Fix template tags and homepage for gsoc --- content/gsoc/cloudflare-captcha-monitoring/contents.lr | 3 ++- content/gsoc/contents.lr | 2 ++ content/gsoc/onion-toolbox/contents.lr | 5 ++++- content/gsoc/privacy-friendly-web/contents.lr | 6 +++++- content/gsoc/tor-relay-ipv6-support/contents.lr | 3 ++- content/gsoc/tor-weather/contents.lr | 3 ++- lego | 2 +- models/project.ini | 6 +++--- templates/home.html | 2 +- templates/macros/projects.html | 4 +++- templates/project.html | 4 ++-- 11 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr b/content/gsoc/cloudflare-captcha-monitoring/contents.lr index e5b71a5..2263ecc 100644 --- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr +++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr @@ -14,7 +14,8 @@ color: primary --- key: 1 --- -languages: javascript +languages: +javascript --- mentors: arma, gk --- diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr index 1e973f0..25d1562 100644 --- a/content/gsoc/contents.lr +++ b/content/gsoc/contents.lr @@ -1,5 +1,7 @@ _template: layout.html --- +_undiscoverable: true +--- section: GSoC --- section_id: gsoc diff --git a/content/gsoc/onion-toolbox/contents.lr b/content/gsoc/onion-toolbox/contents.lr index b9f50bc..7968f31 100644 --- a/content/gsoc/onion-toolbox/contents.lr +++ b/content/gsoc/onion-toolbox/contents.lr @@ -14,7 +14,10 @@ color: primary --- key: 1 --- -languages: Python, Docker, PythonQt5 +languages: +Python +Docker +PythonQt5 --- mentors: hiro, asn --- diff --git a/content/gsoc/privacy-friendly-web/contents.lr b/content/gsoc/privacy-friendly-web/contents.lr index be886de..fb32b0f 100644 --- a/content/gsoc/privacy-friendly-web/contents.lr +++ b/content/gsoc/privacy-friendly-web/contents.lr @@ -14,7 +14,11 @@ color: primary --- key: 1 --- -languages: javascript, CSS, HTML, Python +languages: +javascript +CSS +HTML +Python --- mentors: hiro --- diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr b/content/gsoc/tor-relay-ipv6-support/contents.lr index 3b0cd0f..1300b87 100644 --- a/content/gsoc/tor-relay-ipv6-support/contents.lr +++ b/content/gsoc/tor-relay-ipv6-support/contents.lr @@ -14,7 +14,8 @@ color: primary --- key: 1 --- -languages: C +languages: +C --- mentors: teor, ahf, dgoulet, catalyst --- diff --git a/content/gsoc/tor-weather/contents.lr b/content/gsoc/tor-weather/contents.lr index 95aa94a..0c69dec 100644 --- a/content/gsoc/tor-weather/contents.lr +++ b/content/gsoc/tor-weather/contents.lr @@ -14,7 +14,8 @@ color: primary --- key: 2 --- -languages: TBD +languages: +TBD --- mentors: karsten --- diff --git a/lego b/lego index f0ea955..e9dd081 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523 +Subproject commit e9dd081027132aa21f6abd74be708323ff3b9180 diff --git a/models/project.ini b/models/project.ini index 2ee985e..17c3260 100644 --- a/models/project.ini +++ b/models/project.ini @@ -15,7 +15,7 @@ label = Active type = boolean
[fields.subtitle] -label = Summary +label = Subtitle type = markdown
[fields.color] @@ -23,7 +23,7 @@ label = Color type = string
[fields.body] -label = Description +label = body type = markdown
[fields.mentors] @@ -32,7 +32,7 @@ type = string
[fields.languages] label = Languages -type = string +type = strings
[fields.mentors] label = Mentors diff --git a/templates/home.html b/templates/home.html index 8b6f12f..08d04c9 100644 --- a/templates/home.html +++ b/templates/home.html @@ -7,7 +7,7 @@ <section> <div class="container"> <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in site.query('/').filter(F.section_id != 'gsoc')|sort(attribute='key') %} <div class="col-sm-6 col-md-4 col-sm-12 col-xl-4 py-4"> <div class="card h-100 p-2"> <div class="card-body"> diff --git a/templates/macros/projects.html b/templates/macros/projects.html index 8f26811..d4da228 100644 --- a/templates/macros/projects.html +++ b/templates/macros/projects.html @@ -4,7 +4,9 @@ <h5 class="mb-0"> <a href="{{ item.path|url }}">{{ item.title }}</a> </h5> - <span class="badge badge-primary">{{ item.languages }}</span> + {% for lang in item.languages %} + <span class="badge badge-primary">{{ lang }}</span> + {% endfor %} </div> <div> <div class="card-body"> diff --git a/templates/project.html b/templates/project.html index 1aaed71..f9c5623 100644 --- a/templates/project.html +++ b/templates/project.html @@ -17,13 +17,13 @@ <div class="container py-3 mt-5"> <h4>Project Summary:</h4> <p> - {{ this.summary }} + {{ this.subtitle }} </p> </div> <div class="container py-3"> <h4>Project Description:</h4> <p> - {{ this.description }} + {{ this.body }} </p> </div> <div class="container py-3">