[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [community/develop] [WIP] Working on page layouts
commit 184438ad54a77ef2c3b9fb26cbdc8c06f56146ad
Author: Pili Guerra <pili@xxxxxxxxxxxxxx>
Date: Wed Jan 22 16:05:44 2020 +0100
[WIP] Working on page layouts
---
content/gsoc/contents.lr | 4 +++-
content/gsoc/privacy-friendly-web/contents.lr | 6 +++++-
content/gsoc/tor-weather/contents.lr | 4 ++++
templates/gsoc.html | 19 ++-----------------
templates/layout.html | 9 +++++++++
templates/macros/projects.html | 1 +
6 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr
index fcf4597..2e4ffb5 100644
--- a/content/gsoc/contents.lr
+++ b/content/gsoc/contents.lr
@@ -1,4 +1,4 @@
-_template: gsoc.html
+_template: layout.html
---
section: GSoC
---
@@ -8,6 +8,8 @@ html: gsoc.html
---
color: primary
---
+key: 0
+---
title: Project Ideas
---
body:
diff --git a/content/gsoc/privacy-friendly-web/contents.lr b/content/gsoc/privacy-friendly-web/contents.lr
index 0a9e83b..4aa6016 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -1,6 +1,6 @@
_model: project
---
-_template: project.html
+_template: layout.html
---
active: True
---
@@ -10,6 +10,10 @@ section_id: gsoc
---
color: primary
---
+key: 1
+---
+languages: javascript
+---
title: Privacy Friendly Web
---
summary:
diff --git a/content/gsoc/tor-weather/contents.lr b/content/gsoc/tor-weather/contents.lr
index 8a07c11..f1bebd7 100644
--- a/content/gsoc/tor-weather/contents.lr
+++ b/content/gsoc/tor-weather/contents.lr
@@ -10,6 +10,10 @@ section_id: gsoc
---
color: primary
---
+key: 2
+---
+languages: TBD
+---
title: Tor Weather
---
summary:
diff --git a/templates/gsoc.html b/templates/gsoc.html
index 5bd3c59..2d66065 100644
--- a/templates/gsoc.html
+++ b/templates/gsoc.html
@@ -1,13 +1,4 @@
-<!doctype html>
-{% include 'meta.html' %}
-<body class="no-gutters">
- <header>
- {% include 'navbar.html' %}
- </header>
- <div class="page">
- {% include 'header.html' %}
- {% include 'pagenav.html' %}
- <div class="container-fluid">
+ {% include 'breadcrumb.html' %}
<div class="row flex-xl-nowrap">
<main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
<div class="container py-3">
@@ -45,12 +36,6 @@
<p>{{ _('None of these ideas seem appealing? You may also want to propose your own project idea â?? which often results in the best projects.') }} <a href="/contact">{{ _('We invite you to contact us to discuss your own project idea.') }}</a></p>
</div>
</div>
-
</main>
</div>
- </div>
- </div>
- <footer>
- {% include 'footer.html' %}
- </footer>
-</body>
+
\ No newline at end of file
diff --git a/templates/layout.html b/templates/layout.html
index 663c51b..9ab5aa1 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -10,7 +10,16 @@
<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.parent.path == "/gsoc" %}
+ <div class="container py-3 mt-5">
+ {{ this.summary }}
+ </div>
+ <div class="container py-3">
+ {{ this.description }}
+ </div>
+ {% else %}
{% include this.html %}
+ {% endif %}
</main>
</div>
</div>
diff --git a/templates/macros/projects.html b/templates/macros/projects.html
index a027cfb..99e102b 100644
--- a/templates/macros/projects.html
+++ b/templates/macros/projects.html
@@ -4,6 +4,7 @@
<h5 class="mb-0">
<a href="{{ item.path|url }}">{{ item.title }}</a>
</h5>
+ <span class="badge badge-primary">{{ item.languages }}</span>
</div>
<div>
<div class="card-body">
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits