[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tpo/staging] Update templates and databags
commit c598a01083b9ec09ed7312da626c592df1b845c6
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date: Fri Feb 8 14:45:54 2019 +0100
Update templates and databags
---
content/about/history/contents.lr | 2 ++
content/about/jobs/backend-engineer-ooni/contents.lr | 4 ++++
content/about/jobs/browser-developer/contents.lr | 4 ++++
content/about/jobs/contents.lr | 2 ++
content/about/jobs/developer-data-architect/contents.lr | 4 ++++
content/about/jobs/senior-system-administrator/contents.lr | 4 ++++
content/contact/contents.lr | 2 ++
content/contents.lr | 2 ++
content/download/contents.lr | 2 ++
content/download/languages/contents.lr | 2 ++
content/download/options/contents.lr | 2 ++
content/press/contents.lr | 2 ++
databags/menu+es.ini | 4 ++--
databags/menu+fr.ini | 4 ++--
models/jobs.ini | 5 +++++
models/page.ini | 5 +++++
models/people.ini | 5 +++++
models/press.ini | 5 +++++
models/reports.ini | 5 +++++
models/sponsors.ini | 5 +++++
templates/header.html | 2 +-
templates/pagenav.html | 2 +-
22 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr
index ee2aa85..816832b 100644
--- a/content/about/history/contents.lr
+++ b/content/about/history/contents.lr
@@ -2,6 +2,8 @@ _template: about.html
---
section: about
---
+section_id: about
+---
html: history.html
---
color: primary
diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr b/content/about/jobs/backend-engineer-ooni/contents.lr
index bc005c6..dea705a 100644
--- a/content/about/jobs/backend-engineer-ooni/contents.lr
+++ b/content/about/jobs/backend-engineer-ooni/contents.lr
@@ -2,6 +2,10 @@ _model: job
---
_template: about.html
---
+section: about
+---
+section_id: about
+---
active: True
---
title: Backend Engineer for OONI
diff --git a/content/about/jobs/browser-developer/contents.lr b/content/about/jobs/browser-developer/contents.lr
index 9ed4a40..8bd46e0 100644
--- a/content/about/jobs/browser-developer/contents.lr
+++ b/content/about/jobs/browser-developer/contents.lr
@@ -4,6 +4,10 @@ _template: about.html
---
active: True
---
+section: about
+---
+section_id: about
+---
title: Browser Developer
---
summary:
diff --git a/content/about/jobs/contents.lr b/content/about/jobs/contents.lr
index e139c59..38c41cb 100644
--- a/content/about/jobs/contents.lr
+++ b/content/about/jobs/contents.lr
@@ -4,6 +4,8 @@ _template: about.html
---
section: about
---
+section_id: about
+---
html: jobs.html
---
color: primary
diff --git a/content/about/jobs/developer-data-architect/contents.lr b/content/about/jobs/developer-data-architect/contents.lr
index 611de70..8228fda 100644
--- a/content/about/jobs/developer-data-architect/contents.lr
+++ b/content/about/jobs/developer-data-architect/contents.lr
@@ -1,5 +1,9 @@
_model: job
---
+section: about
+---
+section_id: about
+---
active: False
---
title: Developer Data Architect
diff --git a/content/about/jobs/senior-system-administrator/contents.lr b/content/about/jobs/senior-system-administrator/contents.lr
index a29dcad..b2d9fb2 100644
--- a/content/about/jobs/senior-system-administrator/contents.lr
+++ b/content/about/jobs/senior-system-administrator/contents.lr
@@ -2,6 +2,10 @@ _model: job
---
_template: about.html
---
+section: about
+---
+section_id: about
+---
active: False
---
title: Senior System Administrator
diff --git a/content/contact/contents.lr b/content/contact/contents.lr
index 5f852e5..40b9589 100644
--- a/content/contact/contents.lr
+++ b/content/contact/contents.lr
@@ -2,6 +2,8 @@ _template: layout.html
---
section: the tor project
---
+section_id: the_tor_project
+---
html: contact.html
---
color: primary
diff --git a/content/contents.lr b/content/contents.lr
index 9535b4e..aafc2b5 100644
--- a/content/contents.lr
+++ b/content/contents.lr
@@ -1,5 +1,7 @@
section: home
---
+section_id: home
+---
color: dark
---
_template: jumbotron.html
diff --git a/content/download/contents.lr b/content/download/contents.lr
index ed2a069..de8f01f 100644
--- a/content/download/contents.lr
+++ b/content/download/contents.lr
@@ -2,6 +2,8 @@ _template: jumbotron.html
---
section: download
---
+section_id: download
+---
html: download.html
---
color: dark
diff --git a/content/download/languages/contents.lr b/content/download/languages/contents.lr
index 64f6e8c..095941e 100644
--- a/content/download/languages/contents.lr
+++ b/content/download/languages/contents.lr
@@ -2,6 +2,8 @@ _template: jumbotron.html
---
section: download
---
+section_id: download
+---
html: download-languages.html
---
color: dark
diff --git a/content/download/options/contents.lr b/content/download/options/contents.lr
index 6f6ecf9..f3e48e7 100644
--- a/content/download/options/contents.lr
+++ b/content/download/options/contents.lr
@@ -2,6 +2,8 @@ _template: jumbotron.html
---
section: download
---
+section_id: download
+---
html: download-options.html
---
color: dark
diff --git a/content/press/contents.lr b/content/press/contents.lr
index 53c8ad4..e304e09 100644
--- a/content/press/contents.lr
+++ b/content/press/contents.lr
@@ -4,6 +4,8 @@ _model: press
---
section: the tor project
---
+section_id: the_tor_project
+---
html: press.html
---
color: primary
diff --git a/databags/menu+es.ini b/databags/menu+es.ini
index bc90673..01a8760 100644
--- a/databags/menu+es.ini
+++ b/databags/menu+es.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/menu+fr.ini b/databags/menu+fr.ini
index bc90673..01a8760 100644
--- a/databags/menu+fr.ini
+++ b/databags/menu+fr.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/models/jobs.ini b/models/jobs.ini
index 6f1ce93..0537739 100644
--- a/models/jobs.ini
+++ b/models/jobs.ini
@@ -9,6 +9,11 @@ type = string
[fields.section]
label = Section
type = string
+translate = True
+
+[fields.section_id]
+label = Section_id
+type = string
translate = False
[fields.body]
diff --git a/models/page.ini b/models/page.ini
index 35cc243..2e1f0f7 100644
--- a/models/page.ini
+++ b/models/page.ini
@@ -10,6 +10,11 @@ translate = True
[fields.section]
label = Section
type = string
+translate = True
+
+[fields.section_id]
+label = Section_id
+type = string
translate = False
[fields.body]
diff --git a/models/people.ini b/models/people.ini
index 7547b37..0a8cdf0 100644
--- a/models/people.ini
+++ b/models/people.ini
@@ -11,6 +11,11 @@ translate = True
[fields.section]
label = Section
type = string
+translate = True
+
+[fields.section_id]
+label = Section_id
+type = string
translate = False
[fields.body]
diff --git a/models/press.ini b/models/press.ini
index afaa117..28e0bd1 100644
--- a/models/press.ini
+++ b/models/press.ini
@@ -10,6 +10,11 @@ type = string
[fields.section]
label = Section
type = string
+translate = True
+
+[fields.section_id]
+label = Section_id
+type = string
translate = False
[fields.body]
diff --git a/models/reports.ini b/models/reports.ini
index bb438a8..279c516 100644
--- a/models/reports.ini
+++ b/models/reports.ini
@@ -10,6 +10,11 @@ type = string
[fields.section]
label = Section
type = string
+translate = True
+
+[fields.section_id]
+label = Section_id
+type = string
translate = False
[fields.body]
diff --git a/models/sponsors.ini b/models/sponsors.ini
index 3b29c11..9bb89db 100644
--- a/models/sponsors.ini
+++ b/models/sponsors.ini
@@ -10,6 +10,11 @@ type = string
[fields.section]
label = Section
type = string
+translate = True
+
+[fields.section_id]
+label = Section_id
+type = string
translate = False
[fields.body]
diff --git a/templates/header.html b/templates/header.html
index 40f3faa..9290699 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -22,6 +22,6 @@
</div>
</div>
</div>
-{% if this.section == 'about' %}
+{% if this.section_id == 'about' %}
{% include 'pagenav.html' %}
{% endif %}
diff --git a/templates/pagenav.html b/templates/pagenav.html
index f63a7d2..d572da1 100644
--- a/templates/pagenav.html
+++ b/templates/pagenav.html
@@ -2,7 +2,7 @@
<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 %}
+ {% set menubag = this.section_id + '+' + this.alt %}
{% for id, item in bag(menubag).items() %}
<li{% if this.path == '/' + item.path %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}>
{% set item_path = site.get(item.path) %}
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits