From 88efc5e8bb01f19441a4f2ab1b841cc755a100fa Mon Sep 17 00:00:00 2001
From: rehrar <rehrar@tuta.io>
Date: Tue, 19 Dec 2017 14:16:03 -0700
Subject: [PATCH] Minor adjustments - Adjusted values in en and es yml files -
Minor tweaks in a few pages - Changed head rules to pull correct page titles
- Changed footer and header to loop correctly without a case statement and
pull translated strings - Adjusted FFS layouts
---
_i18n/en.yml | 64 +++++------
_i18n/en/get-started/contributing.md | 2 +-
_i18n/en/get-started/mining.md | 2 +-
_i18n/en/index.md | 24 ++---
_i18n/en/resources/roadmap.md | 2 +-
_i18n/es.yml | 70 ++++++------
_i18n/es/index.md | 30 +++---
_i18n/es/resources/roadmap.md | 2 +-
_includes/footer.html | 70 +++++-------
_includes/head.html | 7 +-
_includes/header.html | 102 +++++++-----------
.../completed-proposals/index.html | 2 +-
.../funding-required/index.html | 2 +-
forum-funding-system/ideas/index.html | 2 +-
forum-funding-system/index.md | 32 +++---
forum-funding-system/open-tasks/index.html | 2 +-
.../work-in-progress/index.html | 2 +-
17 files changed, 184 insertions(+), 233 deletions(-)
diff --git a/_i18n/en.yml b/_i18n/en.yml
index 3da6fcf1..d5bddc7c 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -18,44 +18,38 @@ global:
privacy: Privacy
copyright: Copyright
edit: Edit This Page
-menu:
- forum: Forum
- blog: Blog
- knowledge_base: Knowledge Base
- community: Community
- bitcointalk: Bitcointalk Thread
- reddit: Reddit
- allblog: All Blog Posts
- devdiaries: Dev Diaries
- missives: Monero Missives
- uncategorised: Uncategorized
- choose: How to Choose a Monero Client
- running: How to Run a Monero Node
- donations: Donating and Sponsorships
- contribute: Contributing to Monero
- downloads: All Monero Downloads
- github: GitHub
- merchants: Merchants and Services Directory
- accepting: Accepting Monero Payments
+titles:
+ index: Home
+ whatismonero: What is Monero (XMR)?
+ using: Using Monero
+ accepting: Accepting Monero
+ contributing: Improing Monero
+ mining: Mining Monero
+ faq: FAQ
+ downloads: Downloads
+ allposts: All Blog Posts
+ team: Monero Team
+ hangouts: Hangouts
+ events: Events
+ sponsorships: Sponsorships
+ merchants: Merchants & Services
about: About Monero
- people: The People Behind Monero
+ roadmap: Roadmap
+ researchlab: Monero Research Lab
+ moneropedia: Moneropedia
userguides: User Guides
developerguides: Developer Guides
- vrp: Vulnerability Response Process
- goals: Design & Development Goals
- openalias: The OpenAlias Project
- lab: Monero Research Lab
- alternative: Alternative Clients
- projects: External Projects
- stackexchange: StackExchange Q&A
- slack: Slack Chat
- telegram: Telegram Chat
- irc: IRC on Freenode
- irc-general: "#monero (General)"
- irc-development: "#monero-dev (Development)"
- irc-trading: "#monero-otc (OTC Trading)"
- irc-markets: "#monero-markets (Markets)"
- irc-mining: "#monero-pools (Mining)"
+ technicalspecs: Technical Specs
+ themoneroproject: The Monero Project
+ presskit: Monero Press Kit
+ legal: Legal
+ ffs: Forum Funding System
+ ffs-cp: Completed Proposals
+ ffs-fr: Funding Required
+ ffs-ideas: Ideas
+ ffs-ot: Open Tasks
+ ffs-wip: Work in Progress
+ blogbytag: Blog by Tag
index:
page_title: "Monero - secure, private, untraceable"
what_is_1: What is
diff --git a/_i18n/en/get-started/contributing.md b/_i18n/en/get-started/contributing.md
index 72a02ab1..c2785c78 100644
--- a/_i18n/en/get-started/contributing.md
+++ b/_i18n/en/get-started/contributing.md
@@ -49,7 +49,7 @@ Mining ensures the Monero network remains decentralized and secure. In the Moner
</div>
</div>
<div class="row start-xs">
- <p>Ongoing development is supported by donations and <a href="/community/sponsorships/">sponsorships</a>.</p>
+ <p>Ongoing development is supported by donations and <a href="{{site.baseurl}}/community/sponsorships/">sponsorships</a>.</p>
</div>
<div class="row center-xs">
<div class="col-lg-6">
diff --git a/_i18n/en/get-started/mining.md b/_i18n/en/get-started/mining.md
index 321332b3..ce648307 100644
--- a/_i18n/en/get-started/mining.md
+++ b/_i18n/en/get-started/mining.md
@@ -16,7 +16,7 @@
</div>
</div>
<div class="row center-xs">
- <p>See <a href="/community/hangouts/"> Hangouts</a>, <a href="https://www.reddit.com/r/MoneroMining/" target="_blank" rel="noreferrer noopener">/r/moneromining</a> and <a href="irc://chat.freenode.net/#monero-pools" target="_blank" rel="noreferrer noopener">#monero-pools</a>.</p>
+ <p>See <a href="{{site.baseurl}}/community/hangouts/"> Hangouts</a>, <a href="https://www.reddit.com/r/MoneroMining/" target="_blank" rel="noreferrer noopener">/r/moneromining</a> and <a href="irc://chat.freenode.net/#monero-pools" target="_blank" rel="noreferrer noopener">#monero-pools</a>.</p>
</div>
</div>
</div>
diff --git a/_i18n/en/index.md b/_i18n/en/index.md
index 964b48f7..266200cc 100644
--- a/_i18n/en/index.md
+++ b/_i18n/en/index.md
@@ -16,7 +16,7 @@
<h1 id="main-h1">Monero</h1>
<h2 id="main-h2">Private Digital Currency</h2>
<p id="main-text">Monero is a secure, private, and untraceable cryptocurrency. It is open-source and accessible to all. With Monero, you are your own bank. Only you control and are responsible for your funds. Your accounts and transactions are kept private from prying eyes.</p>
- <p><a href="/get-started/using/" class="btn-link btn-auto btn-primary">Get Started</a></p>
+ <p><a href="{{site.baseurl}}/get-started/using/" class="btn-link btn-auto btn-primary">Get Started</a></p>
</div>
</div>
</div>
@@ -64,7 +64,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-8 col-xs-12 why-text">
<h3>Monero is fungible</h3>
- <p> Monero is <a href="/resources/moneropedia/fungibility.html">fungible</a> because it is private by default. Units of Monero cannot be blacklisted by vendors or exchanges due to their association in previous transactions.</p>
+ <p> Monero is <a href="{{site.baseurl}}/resources/moneropedia/fungibility.html">fungible</a> because it is private by default. Units of Monero cannot be blacklisted by vendors or exchanges due to their association in previous transactions.</p>
</div>
</div>
</div>
@@ -86,22 +86,22 @@
</div>
<div class="row around-xs">
<div class="col">
- <p><a href="/downloads#windows" class="btn-link btn-fixed"><span class="icon-windows"></span>Monero for Windows</a></p>
+ <p><a href="{{site.baseurl}}/downloads#windows" class="btn-link btn-fixed"><span class="icon-windows"></span>Monero for Windows</a></p>
</div>
<div class="col">
- <p><a href="/downloads#mac" class="btn-link btn-fixed"><span class="icon-apple"></span>Monero for Mac</a></p>
+ <p><a href="{{site.baseurl}}/downloads#mac" class="btn-link btn-fixed"><span class="icon-apple"></span>Monero for Mac</a></p>
</div>
</div>
<div class="row around-xs">
<div class="col">
- <p><a href="/downloads#linux" class="btn-link btn-fixed"><span class="icon-linux"></span>Monero for Linux</a></p>
+ <p><a href="{{site.baseurl}}/downloads#linux" class="btn-link btn-fixed"><span class="icon-linux"></span>Monero for Linux</a></p>
</div>
<div class="col">
- <p><a href="/downloads#source" class="btn-link btn-fixed"><span class="icon-blockchain"></span>Latest Blockchain</a></p>
+ <p><a href="{{site.baseurl}}/downloads#source" class="btn-link btn-fixed"><span class="icon-blockchain"></span>Latest Blockchain</a></p>
</div>
</div>
<div class="row">
- <div class="col-xs-12"><p class="main-downloads">Need it for a different operating system? <a href="/downloads/">View all available downloads here.</a></p>
+ <div class="col-xs-12"><p class="main-downloads">Need it for a different operating system? <a href="{{site.baseurl}}/downloads/">View all available downloads here.</a></p>
</div>
</div>
</div>
@@ -118,7 +118,7 @@
{% for post in site.posts limit:2 %}
<div class="row start-xs">
<div class="col">
- <p><a href="{{ post.url }}">{{ post.title }}</a></p>
+ <p><a href="{{site.baseurl}}/{{ post.url }}">{{ post.title }}</a></p>
</div>
</div>
{% endfor %}
@@ -126,7 +126,7 @@
<div class="row end-xs">
<div class="col">
- <p><a href="/blog/">More news</a></p>
+ <p><a href="{{site.baseurl}}/blog/">More news</a></p>
</div>
</div>
</div>
@@ -149,7 +149,7 @@
<div class="col">
<h2>Moneropedia</h2>
<p class="main-resources">Would you like to look up the meanings of the terms and concepts used in Monero? Here you will find an alphabetical guide to terms and their meanings from both the Monero and Kovri projects.</p>
- <p><a href="/resources/moneropedia/" class="btn-link btn-auto">Read Moneropedia</a></p>
+ <p><a href="{{site.baseurl}}/resources/moneropedia/" class="btn-link btn-auto">Read Moneropedia</a></p>
</div>
</div>
</div>
@@ -163,7 +163,7 @@
<div class="col">
<h2>User Guides</h2>
<p class="main-resources">Step-by-step guides to all things Monero are separated by category and cover everything from creating a wallet to supporting the network, and even how to edit this website.</p>
- <p><a href="/resources/user-guides/" class="btn-link btn-auto">Read user guides</a></p>
+ <p><a href="{{site.baseurl}}/resources/user-guides/" class="btn-link btn-auto">Read user guides</a></p>
</div>
</div>
</div>
@@ -177,7 +177,7 @@
<div class="col">
<h2>FAQ</h2>
<p class="main-resources">We've heard a lot of questions over the years and have compiled, for your convenience, a thorough and varied FAQ. Don't worry, if your questions are not on here, you can always ask the community.</p>
- <p><a href="/get-started/faq/" class="btn-link btn-auto">Read answers</a></p>
+ <p><a href="{{site.baseurl}}/get-started/faq/" class="btn-link btn-auto">Read answers</a></p>
</div>
</div>
</div>
diff --git a/_i18n/en/resources/roadmap.md b/_i18n/en/resources/roadmap.md
index b06b7d60..f60d69b1 100644
--- a/_i18n/en/resources/roadmap.md
+++ b/_i18n/en/resources/roadmap.md
@@ -23,7 +23,7 @@
<input id="tab-1" type="radio" name="tabs" aria-hidden="true">
<h2>2014</h2>
<div class="tabPanel-content">
- {% for toplevel in site.data.roadmap %}
+ {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2014 %}
{% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs">
diff --git a/_i18n/es.yml b/_i18n/es.yml
index 3da6fcf1..1e0beccb 100644
--- a/_i18n/es.yml
+++ b/_i18n/es.yml
@@ -18,44 +18,38 @@ global:
privacy: Privacy
copyright: Copyright
edit: Edit This Page
-menu:
- forum: Forum
- blog: Blog
- knowledge_base: Knowledge Base
- community: Community
- bitcointalk: Bitcointalk Thread
- reddit: Reddit
- allblog: All Blog Posts
- devdiaries: Dev Diaries
- missives: Monero Missives
- uncategorised: Uncategorized
- choose: How to Choose a Monero Client
- running: How to Run a Monero Node
- donations: Donating and Sponsorships
- contribute: Contributing to Monero
- downloads: All Monero Downloads
- github: GitHub
- merchants: Merchants and Services Directory
- accepting: Accepting Monero Payments
- about: About Monero
- people: The People Behind Monero
- userguides: User Guides
- developerguides: Developer Guides
- vrp: Vulnerability Response Process
- goals: Design & Development Goals
- openalias: The OpenAlias Project
- lab: Monero Research Lab
- alternative: Alternative Clients
- projects: External Projects
- stackexchange: StackExchange Q&A
- slack: Slack Chat
- telegram: Telegram Chat
- irc: IRC on Freenode
- irc-general: "#monero (General)"
- irc-development: "#monero-dev (Development)"
- irc-trading: "#monero-otc (OTC Trading)"
- irc-markets: "#monero-markets (Markets)"
- irc-mining: "#monero-pools (Mining)"
+titles:
+ index: Inicio
+ whatismonero: ¿Qué es Monero (XMR)?
+ using: Usar Monero
+ accepting: Aceptar Monero
+ contributing: Mejorar Monero
+ mining: Minar Monero
+ faq: FAQ
+ downloads: Descargas
+ allposts: All Blog Posts
+ team: Equipo
+ hangouts: Canales de comunicación
+ events: Eventos
+ sponsorships: Patrocinios
+ merchants: Comerciantes y Servicios
+ about: Sobre Monero
+ roadmap: Hoja de ruta
+ researchlab: Laboratorio de investigación de Monero (MRL)
+ moneropedia: Moneropedia
+ userguides: GuÃas de usuario
+ developerguides: GuÃas de desarrolladores
+ technicalspecs: Especificaciones técnicas
+ themoneroproject: The Monero Project
+ presskit: Monero Press Kit
+ legal: Legal
+ ffs: Forum Funding System
+ ffs-cp: Completed Proposals
+ ffs-fr: Funding Required
+ ffs-ideas: Ideas
+ ffs-ot: Open Tasks
+ ffs-wip: Work in Progress
+ blogbytag: Blog by Tag
index:
page_title: "Monero - secure, private, untraceable"
what_is_1: What is
diff --git a/_i18n/es/index.md b/_i18n/es/index.md
index 4a62989b..03f6998a 100644
--- a/_i18n/es/index.md
+++ b/_i18n/es/index.md
@@ -5,7 +5,7 @@
<div class="col-lg-7 col-md-7 col-xs-12 main-video">
<div class="monero-video">
<!--iframe width="560" height="315" src="https://www.youtube.com/embed/TZi9xx6aiuY" frameborder="0" allowfullscreen></iframe-->
- <video controls poster="img/monero-community.png" onclick="this.paused ? this.play() : this.pause();" preload="none">
+ <video controls poster="/img/monero-community.png" onclick="this.paused ? this.play() : this.pause();" preload="none">
<source src="/media/Monero_Promo.m4v">
</video>
</div>
@@ -15,7 +15,7 @@
<h1 id="main-h1">Monero</h1>
<h2 id="main-h2">Moneda Digital Privada</h2>
<p id="main-text">Monero es una moneda privada, segura y no rastreable. Tiene el código abierto y está disponible para todos. Con Monero, usted es su propio banco. Sólo usted controla sus finanzas. Sus cuentas y transacciones están cubiertas de ojos curiosos.</p>
- <p><a href="/get-started/using/" class="btn-link btn-auto btn-primary">Empezar</a></p>
+ <p><a href="{{site.baseurl}}/get-started/using/" class="btn-link btn-auto btn-primary">Empezar</a></p>
</div>
</div>
</div>
@@ -47,8 +47,8 @@
</div>
<div class="row middle-xs info-block-row">
<div class="col-lg-6 col-md-6 col-sm-8 col-xs-12 why-text">
- <h3>Monero is untraceable.</h3>
- <p>Sending and receiving addresses as well as transacted amounts are obfuscated by default. Transactions on the Monero blockchain cannot be linked to a particular user or real-world identity.</p>
+ <h3>Monero es no rastreable.</h3>
+ <p>El enviar y el recibir Monero se ofuscan por defecto. Las transacciones en la cadena de bloques no pueden identificar a un usuario particular o una persona real.</p>
</div>
<div class="col-lg-6 col-md-6 col-sm-4 col-xs-12 last-sm first-xs center-xs">
<img src="/img/untraceable-monero.png" alt="Untraceable Monero paths" class="main-icon">
@@ -77,22 +77,22 @@
</div>
<div class="row around-xs">
<div class="col">
- <p><a href="/downloads#windows" class="btn-link btn-fixed"><span class="icon-windows"></span>Monero para Windows</a></p>
+ <p><a href="{{site.baseurl}}/downloads#windows" class="btn-link btn-fixed"><span class="icon-windows"></span>Monero para Windows</a></p>
</div>
<div class="col">
- <p><a href="/downloads#mac" class="btn-link btn-fixed"><span class="icon-apple"></span>Monero para Mac</a></p>
+ <p><a href="{{site.baseurl}}/downloads#mac" class="btn-link btn-fixed"><span class="icon-apple"></span>Monero para Mac</a></p>
</div>
</div>
<div class="row around-xs">
<div class="col">
- <p><a href="/downloads#linux" class="btn-link btn-fixed"><span class="icon-linux"></span>Monero para Linux</a></p>
+ <p><a href="{{site.baseurl}}/downloads#linux" class="btn-link btn-fixed"><span class="icon-linux"></span>Monero para Linux</a></p>
</div>
<div class="col">
- <p><a href="/downloads#source" class="btn-link btn-fixed"><span class="icon-blockchain"></span>La cadena de bloques</a></p>
+ <p><a href="{{site.baseurl}}/downloads#source" class="btn-link btn-fixed"><span class="icon-blockchain"></span>La cadena de bloques</a></p>
</div>
</div>
<div class="row">
- <div class="col-xs-12"><p class="main-downloads">¿Usa otro sistema operativo?<a href="/downloads/">Véase todas descargas disponibles aquÃ.</a></p>
+ <div class="col-xs-12"><p class="main-downloads">¿Usa otro sistema operativo?<a href="{{site.baseurl}}/downloads/"> Véase todas descargas disponibles aquÃ.</a></p>
</div>
</div>
</div>
@@ -108,13 +108,13 @@
{% for post in site.posts limit:2 %}
<div class="row start-xs">
<div class="col">
- <p><a href="{{ post.url }}">{{ post.title }}</a></p>
+ <p><a href="{{site.baseurl}}/{{ post.url }}">{{ post.title }}</a></p>
</div>
</div>
{% endfor %}
<div class="row end-xs">
<div class="col">
- <p><a href="/blog/">Más noticias</a></p>
+ <p><a href="{{site.baseurl}}/blog/">Más noticias</a></p>
</div>
</div>
</div>
@@ -134,7 +134,7 @@
<div class="col">
<h2>Moneropedia</h2>
<p class="main-resources">¿Quisiera ver las definiciones de términos y conceptos usados en Monero? Aquà encontrará la lista alfabética de términos de los proyectos Monero y Kovri y sus significados.</p>
- <p><a href="/resources/moneropedia/" class="btn-link btn-auto">Leer Moneropedia</a></p>
+ <p><a href="{{site.baseurl}}/resources/moneropedia/" class="btn-link btn-auto">Leer Moneropedia</a></p>
</div>
</div>
</div>
@@ -147,7 +147,7 @@
<div class="col">
<h2>GuÃas de usuarios</h2>
<p class="main-resources">Los guÃas, que describen varios procesos paso a paso, se separan por categorÃa. Cubren todos los asuntos, de cómo crear una billetera a cómo apoyar la red y aun cómo editar el sitio web.</p>
- <p><a href="/resources/user-guides/" class="btn-link btn-auto">Ver guÃas de usuarios</a></p>
+ <p><a href="{{site.baseurl}}/resources/user-guides/" class="btn-link btn-auto">Ver guÃas de usuarios</a></p>
</div>
</div>
</div>
@@ -159,8 +159,8 @@
<div class="row center-xs">
<div class="col">
<h2>FAQ</h2>
- <p class="main-resources">Hemos escuchado muchas preguntas a lo largo de los años y hemos compilado un FAQ variado y profundo para su conveniencia. No se preocupe, si sus preguntas no están aquÃ, puede hacerlas en los canales de comunicación de la comunidad.</p>
- <p><a href="/get-started/faq/" class="btn-link btn-auto">Ver respuestas</a></p>
+ <p class="main-resources">Hemos compilado un FAQ variado y profundo para su conveniencia. No se preocupe, si sus preguntas no están aquÃ, puede hacerlas en los canales de comunicación de la comunidad.</p>
+ <p><a href="{{site.baseurl}}/get-started/faq/" class="btn-link btn-auto">Ver respuestas</a></p>
</div>
</div>
</div>
diff --git a/_i18n/es/resources/roadmap.md b/_i18n/es/resources/roadmap.md
index b06b7d60..f60d69b1 100644
--- a/_i18n/es/resources/roadmap.md
+++ b/_i18n/es/resources/roadmap.md
@@ -23,7 +23,7 @@
<input id="tab-1" type="radio" name="tabs" aria-hidden="true">
<h2>2014</h2>
<div class="tabPanel-content">
- {% for toplevel in site.data.roadmap %}
+ {% for toplevel in site.data.lang[site.lang].roadmap %}
{% if toplevel.year == 2014 %}
{% for roadlist in toplevel.accomplishments %}
<div class="row start-xs middle-xs">
diff --git a/_includes/footer.html b/_includes/footer.html
index d15590f6..48099ee4 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,60 +1,40 @@
<footer class="container-fluid">
<div class="container">
<div class="row around-xs footer-wrapper">
- <div class="col-sm-3 col-xs-6">
- <h3>Resources</h3>
- <ul class="list-unstyled">
- <li><a href="/resources/about/" class="white">About Monero</a></li>
- <li><a href="/resources/moneropedia/" class="white">Moneropedia</a></li>
- <li><a href="/resources/developer-guides/" class="white">Developer Guides</a></li>
- <li><a href="/resources/user-guides/" class="white">User Guides</a></li>
- <li><a href="https://getmonero.org/feed.xml" class="white">RSS Feed</a></li>
- </ul>
- </div>
- <div class="col-sm-3 col-xs-6">
- <h3>IRC Channels</h3>
- <ul class="list-unstyled">
- <li><a href="irc://chat.freenode.net/#monero" class="white">#monero (General)</a></li>
- <li><a href="irc://chat.freenode.net/#monero-dev" class="white">#monero-dev (Development)</a></li>
- <li><a href="irc://chat.freenode.net/#monero-markets" class="white">#monero-markets (Markets)</a></li>
- <li><a href="irc://chat.freenode.net/#monero-pools" class="white">#monero-pools (Mining)</a></li>
- <li><a href="irc://chat.freenode.net/#monero-community" class="white">#monero-community (Community)</a></li>
- <li><a href="irc://chat.freenode.net/#monero-translations" class="white">#monero-translations (Localization)</a></li>
- </ul>
- </div>
- <div class="col-sm-3 col-xs-6">
- <h3>Community</h3>
- <ul class="list-unstyled">
- <li><a href="https://reddit.com/r/monero" class="white">Reddit</a></li>
- <li><a href="https://monero.stackexchange.com" class="white">Stack Exchange</a></li>
- <li><a href="https://bitcointalk.org/index.php?topic=583449.0" class="white">BitcoinTalk Thread</a></li>
- <li><a href="https://mattermost.getmonero.org" class="white">MatterMost Chat</a></li>
- <li><a href="https://telegram.me/bitmonero" class="white">Telegram Chat</a></li>
- </ul>
- </div>
- <div class="col-sm-3 col-xs-6">
- <h3>The Monero Project</h3>
- <ul class="list-unstyled">
- <li><a href="https://openalias.org" class="white">Open Alias</a></li>
- <li><a href="https://getkovri.org" class="white">Kovri</a></li>
- <li><a href="/resources/research-lab/" class="white">Monero Research Lab</a></li>
- <li><a href="/press-kit/" class="white">Monero Press Kit</a></li>
- </ul>
- </div>
- </div>
+ {% for item in site.data.lang[site.lang].footer-1 %}
+ <div class="col-sm-3 col-xs-6">
+ <h3>{{item.title}}</h3>
+ <ul class="list-unstyled">
+ {% for entry in item.subfolderitems %}
+ {% if entry.url contains 'https://' %}
+ <li><a class="white" href="{{ entry.url }}">{{ entry.name }}</a></li>
+ {%elsif entry.url contains 'irc'%}
+ <li><a class="white" href="{{ entry.url }}">{{ entry.name }}</a></li>
+ {%else%}
+ <li><a class="white" href="{{site.baseurl}}/{{ entry.url }}">{{ entry.name }}</a></li>
+ {%endif%}
+ {% endfor %}
+ </ul>
+ </div>
+ {% endfor %}
<div class="row center-xs">
<div class="social-icons">
</div>
<div class="footer-links">
<ul class="list-unstyled list-inline">
- <li><a href="/legal/" class="white footer-link">Legal</a></li>
- <li><a href="https://github.com/monero-project" class="white footer-link">Source Code</a></li>
- <li><a href="/resources/technical-specs/" class="white footer-link">Technical Specs</a></li>
+ {% for item in site.data.lang[site.lang].footer-2 %}
+ {% if item.url contains 'https://' %}
+ <li><a href="{{item.url}}" class="white footer-link">{{item.name}}</a></li>
+ {%else%}
+ <li><a href="{{site.baseurl}}/{{item.url}}" class="white footer-link">{{item.name}}</a></li>
+ {%endif%}
+ {% endfor %}
</ul>
</div>
</div>
+ </div>
</div>
- </footer>
+</footer>
<!-- JS -->
diff --git a/_includes/head.html b/_includes/head.html
index 5e3b12e0..a4217b0f 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,7 +3,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <title>{% if page.entry %}{{ page.entry }} | {% t global.wiki %} | {% t index.page_title %}{% elsif tag %}{% t global.tags %}: {{ tag.name }} | {% t index.page_title %}{% elsif page.title %}{{ page.title }} | {% t index.page_title %}{% else %}{% t index.page_title %}{% endif %}</title>
+ <title>
+ {% if page.entry %}{{ page.entry }} | {% t global.wiki %} | {% t index.page_title %}
+ {% elsif tag %}{% t global.tags %}: {{ tag.name }} | {% t index.page_title %}
+ {% elsif page.title contains "titles." %}{% t page.title %} | {% t index.page_title %}
+ {% elsif page.title %} {{page.title}} | {% t index.page_title %}
+ {% else %}{% t index.page_title %}{% endif %}</title>
<meta name="description" content="{% if page.entry %}{{ page.entry }}: {{ page.summary }} [{% t global.wikimeta %}]{% elsif tag %}{% t global.tagsmeta %}: {{ tag.name }}{% elsif page.meta %}{{ page.meta }}{% elsif page.title %}{{ page.title }} [{% t global.titlemeta %}]{% else %}{{ site.description }}{% endif %}">
<meta name="keywords" content="{{ site.keywords }}">
diff --git a/_includes/header.html b/_includes/header.html
index 5db86848..984f1587 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -4,9 +4,7 @@
<div class="slide-in-nav">
<div class="container slide-in">
- {% case site.lang %}
- {% when 'en' %}
- {% for item in site.data.navigation.en %}
+ {% for item in site.data.lang[site.lang].navigation %}
<div class="row">
<div class="col-xs-12 dropdown text-center nav-item">
{% if item.subfolderitems %}
@@ -24,29 +22,6 @@
</div>
</div>
{% endfor %}
-
- {% when 'es' %}
- {% for item in site.data.navigation.es %}
- <div class="row">
- <div class="col-xs-12 dropdown text-center nav-item">
- {% if item.subfolderitems %}
- {%assign counter=counter | plus: 1%}
- <label for="drop{{counter}}">{{item.title}}<div class="arrow-down"></div></label>
- <input class="burger-checkdropdown" id="drop{{counter}}" type="checkbox">
- <div class="dropdown-content">
- {% for entry in item.subfolderitems %}
- <a href="{{site.baseurl}}/{{ entry.url }}">{{ entry.page }}</a>
- {% endfor %}
- </div>
- {% else %}
- <a href="{{site.baseurl}}/{{item.url}}">{{item.title}}</a>
- {% endif %}
- </div>
- </div>
- {% endfor %}
-
- {% endcase %}
-
<div class="row">
<div class="col-xs-12">
<div class="text-center nav-item mob">
@@ -89,11 +64,34 @@
{% endif %}"><img src="/img/monero-logo.png" alt="Monero Logo" class="monero-logo"></a>
</div>
<div class="col-lg-8 col-md-8 col-sm-8 topnav-list end-xs">
- <div class="row end-xs">
+ <div class="row end-xs middle-xs">
<div class="col-md-12">
- <a href="https://forum.getmonero.org" class="mob top-link col-md-4">Forum Funding System</a>
- <a href="https://github.com/monero-project/meta/blob/master/VULNERABILITY_RESPONSE_PROCESS.md" class="mob top-link col-md-4">Vulnerability Response</a>
- <a href="{{site.baseurl}}/the-monero-project/" class="mob top-link col-md-3">The Monero Project</a>
+ <a href="https://forum.getmonero.org" class="top-link">Forum Funding System</a>
+ <a href="https://github.com/monero-project/meta/blob/master/VULNERABILITY_RESPONSE_PROCESS.md" class="top-link">Vulnerability Response</a>
+ <a href="{{site.baseurl}}/the-monero-project/" class="top-link">The Monero Project</a>
+ <div href="#" class="dropdown top-link language-change">
+ <input class="burger-checkdropdown" id="langdrop" type="checkbox">
+ <label for="langdrop">{% for lang in site.languages %}
+
+ {% if lang == site.lang %}
+
+ {% t langs.{{ lang }} %}
+
+ {%endif%}
+
+ {%endfor%}<div class="arrow-down"></div></label>
+ <div class="dropdown-content text-center">
+ {% for lang in site.languages %}
+ {% unless site.lang == lang %}
+ {% if lang == site.default_lang %}
+ <a href="{{ site.baseurl_root }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+ {% else %}
+ <a href="{{ site.baseurl_root }}/{{ lang }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+ {% endif %}
+ {% endunless %}
+ {% endfor %}
+ </div>
+ </div>
</div>
</div>
</div>
@@ -102,26 +100,7 @@
<div class="botnav white-nav">
<input class="burger-check" id="burger-check" type="checkbox"><label for="burger-check" class="burger"></label>
<div class="row between-xs nav-items">
-
- {% case site.lang %}
- {% when 'en' %}
- {% for item in site.data.navigation.en %}
- <div class="col dropdown nav-item">
- {% if item.subfolderitems %}
- <label for="desktopdrop1">{{item.title}}<div class="arrow-down"></div></label>
- <input class="burger-checkdropdown" id="desktopdrop1" type="checkbox">
- <div class="dropdown-content">
- {% for entry in item.subfolderitems %}
- <a href="{{site.baseurl}}/{{ entry.url }}">{{ entry.page }}</a>
- {% endfor %}
- </div>
- {% else %}
- <a href="{{site.baseurl}}/{{item.url}}">{{item.title}}</a>
- {% endif %}
- </div>
- {% endfor %}
- {% when 'es' %}
- {% for item in site.data.navigation.es %}
+ {% for item in site.data.lang[site.lang].navigation %}
<div class="col dropdown nav-item">
{% if item.subfolderitems %}
<label for="desktopdrop1">{{item.title}}<div class="arrow-down"></div></label>
@@ -136,14 +115,12 @@
{% endif %}
</div>
{% endfor %}
- {%endcase%}
-
</div>
</div>
</nav>
</div>
<div class="mob bot-nav white-nav">
- <div class="row center-xs">
+ <div class="row center-xs middle-xs">
<div class="col-xs-6">
<a href="{% if site.lang == 'en' %}
@@ -157,16 +134,17 @@
</div>
<div class="dropdown col-xs-6 text-center mob-language-change">
<input class="burger-checkdropdown" id="moblangdrop" type="checkbox">
- <label for="moblangdrop">{% for lang in site.languages %}
-
- {% if lang == site.lang %}
-
- {% t langs.{{ lang }} %}
-
- {%endif%}
-
- {%endfor%}<div class="arrow-down"></div></label>
+ <label for="moblangdrop"><img src="/img/language.png" alt="Lang" class="icon-language"/><div class="arrow-down"></div></label>
<div class="mob dropdown-content text-center">
+ <p class="mob-lang-change mob-lang-selected">
+
+ {% for lang in site.languages %}
+ {% if site.lang == lang %}
+ {% t langs.{{ lang }} %}
+ {% endif %}
+ {% endfor %}
+
+ </p>
{% for lang in site.languages %}
{% unless site.lang == lang %}
{% if lang == site.default_lang %}
diff --git a/forum-funding-system/completed-proposals/index.html b/forum-funding-system/completed-proposals/index.html
index 29aa9eb0..00fac6b1 100644
--- a/forum-funding-system/completed-proposals/index.html
+++ b/forum-funding-system/completed-proposals/index.html
@@ -1,6 +1,6 @@
---
layout: custom
-title: Completed Proposals
+title: titles.ffs-cp
---
<div class="container ffs-backlink">
diff --git a/forum-funding-system/funding-required/index.html b/forum-funding-system/funding-required/index.html
index c27d7419..d7432467 100644
--- a/forum-funding-system/funding-required/index.html
+++ b/forum-funding-system/funding-required/index.html
@@ -1,6 +1,6 @@
---
layout: custom
-title: Funding Required
+title: titles.ffs-fr
---
<div class="container ffs-backlink">
diff --git a/forum-funding-system/ideas/index.html b/forum-funding-system/ideas/index.html
index 0f3ef3f0..628f2abf 100644
--- a/forum-funding-system/ideas/index.html
+++ b/forum-funding-system/ideas/index.html
@@ -1,6 +1,6 @@
---
layout: custom
-title: Ideas
+title: titles.ffs-ideas
---
<div class="container ffs-backlink">
diff --git a/forum-funding-system/index.md b/forum-funding-system/index.md
index 29a15dd6..74aad5ba 100644
--- a/forum-funding-system/index.md
+++ b/forum-funding-system/index.md
@@ -1,6 +1,6 @@
---
layout: custom
-title: Forum Funding System
+title: titles.ffs
---
<div class="ffs">
<div class="desktop">
@@ -18,14 +18,14 @@ title: Forum Funding System
{% for toplevel in site.data.ffs %}
{% if toplevel.stage == "Ideas" %}
{% for proposal in toplevel.proposals limit:2 %}
- <h3><a href="{{proposal.url}}">{{proposal.name}}</a></h3>
+ <h3><a href="{{site.baseurl}}/{{proposal.url}}">{{proposal.name}}</a></h3>
<p>Summary: {{proposal.summary}}</p>
<p>Author: {{proposal.author}}</p>
{%endfor%}
{%endif%}
{%endfor%}
<div class="row center-xs">
- <p><a href="/forum-funding-system/ideas/" class="btn-link btn-fixed">See all Ideas</a></p>
+ <p><a href="{{site.baseurl}}/forum-funding-system/ideas/" class="btn-link btn-fixed">See all Ideas</a></p>
</div>
</div>
<label for="tab-2" tabindex="0"></label>
@@ -35,13 +35,13 @@ title: Forum Funding System
{% for toplevel in site.data.ffs %}
{% if toplevel.stage == "Open Tasks" %}
{% for proposal in toplevel.proposals limit:2 %}
- <h3><a href="{{proposal.url}}">{{proposal.name}}</a></h3>
+ <h3><a href="{{site.baseurl}}/{{proposal.url}}">{{proposal.name}}</a></h3>
<p>Summary: {{proposal.summary}}</p>
<p>Author: {{proposal.author}}</p>
{%endfor%}
{%endif%}
{%endfor%}
- <div class="row center-xs"><p><a href="/forum-funding-system/open-tasks/" class="btn-link btn-fixed">See all Open Tasks</a></p>
+ <div class="row center-xs"><p><a href="{{site.baseurl}}/forum-funding-system/open-tasks/" class="btn-link btn-fixed">See all Open Tasks</a></p>
</div>
</div>
<label for="tab-3" tabindex="0"></label>
@@ -51,14 +51,14 @@ title: Forum Funding System
{% for toplevel in site.data.ffs %}
{% if toplevel.stage == "Funding Required" %}
{% for proposal in toplevel.proposals limit:2 %}
- <h3><a href="{{proposal.url}}">{{proposal.name}}</a></h3>
+ <h3><a href="{{site.baseurl}}/{{proposal.url}}">{{proposal.name}}</a></h3>
<p>Summary: {{proposal.summary}}</p>
<p>Author: {{proposal.author}}</p>
{%endfor%}
{%endif%}
{%endfor%}
<div class="row center-xs">
- <p><a href="/forum-funding-system/funding-required/" class="btn-link btn-fixed">See all Funding Required</a></p>
+ <p><a href="{{site.baseurl}}/forum-funding-system/funding-required/" class="btn-link btn-fixed">See all Funding Required</a></p>
</div>
</div>
<label for="tab-4" tabindex="0"></label>
@@ -68,14 +68,14 @@ title: Forum Funding System
{% for toplevel in site.data.ffs %}
{% if toplevel.stage == "Work in Progress" %}
{% for proposal in toplevel.proposals limit:2 %}
- <h3><a href="{{proposal.url}}">{{proposal.name}}</a></h3>
+ <h3><a href="{{site.baseurl}}/{{proposal.url}}">{{proposal.name}}</a></h3>
<p>Summary: {{proposal.summary}}</p>
<p>Author: {{proposal.author}}</p>
{%endfor%}
{%endif%}
{%endfor%}
<div class="row center-xs">
- <p><a href="/forum-funding-system/work-in-progress/" class="btn-link btn-fixed">See all Work in Progress</a></p>
+ <p><a href="{{site.baseurl}}/forum-funding-system/work-in-progress/" class="btn-link btn-fixed">See all Work in Progress</a></p>
</div>
</div>
<label for="tab-5" tabindex="0"></label>
@@ -85,14 +85,14 @@ title: Forum Funding System
{% for toplevel in site.data.ffs %}
{% if toplevel.stage == "Completed Proposals" %}
{% for proposal in toplevel.proposals limit:2 %}
- <h3><a href="{{proposal.url}}">{{proposal.name}}</a></h3>
+ <h3><a href="{{site.baseurl}}/{{proposal.url}}">{{proposal.name}}</a></h3>
<p>Summary: {{proposal.summary}}</p>
<p>Author: {{proposal.author}}</p>
{%endfor%}
{%endif%}
{%endfor%}
<div class="row center-xs">
- <p><a href="/forum-funding-system/completed-proposals/" class="btn-link btn-fixed">See Completed Proposals</a></p>
+ <p><a href="{{site.baseurl}}/forum-funding-system/completed-proposals/" class="btn-link btn-fixed">See Completed Proposals</a></p>
</div>
</div>
</div>
@@ -105,7 +105,7 @@ title: Forum Funding System
<div class="row">
<div class="col-md-6 col-sm-6 col-xs-6">
<div class="ffs-btn-wrap">
- <a id="ffs-ideas" class="ffs-btn" href="/forum-funding-system/ideas/">Ideas
+ <a id="ffs-ideas" class="ffs-btn" href="{{site.baseurl}}/forum-funding-system/ideas/">Ideas
</a>
</div>
</div>
@@ -113,7 +113,7 @@ title: Forum Funding System
<div class="col-md-6 col-sm-6 col-xs-6">
<div class="ffs-btn-wrap">
- <a id="ffs-opentasks" class="ffs-btn" href="/forum-funding-system/open-tasks/">Open Tasks</a>
+ <a id="ffs-opentasks" class="ffs-btn" href="{{site.baseurl}}/forum-funding-system/open-tasks/">Open Tasks</a>
</div>
</div>
@@ -124,7 +124,7 @@ title: Forum Funding System
<div class="col-md-6 col-sm-6 col-xs-6">
<div class="ffs-btn-wrap">
- <a id="ffs-fundingrequired" class="ffs-btn" href="/forum-funding-system/funding-required/">Funding Required</a>
+ <a id="ffs-fundingrequired" class="ffs-btn" href="{{site.baseurl}}/forum-funding-system/funding-required/">Funding Required</a>
</div>
</div>
@@ -132,7 +132,7 @@ title: Forum Funding System
<div class="col-md-6 col-sm-6 col-xs-6">
<div class="ffs-btn-wrap">
- <a id="ffs-workinprogress" class="ffs-btn" href="/forum-funding-system/work-in-progress/">Work in Progress</a>
+ <a id="ffs-workinprogress" class="ffs-btn" href="{{site.baseurl}}/forum-funding-system/work-in-progress/">Work in Progress</a>
</div>
</div>
@@ -144,7 +144,7 @@ title: Forum Funding System
<div class="col-xs-12">
<div class="ffs-btn-wrap">
- <a id="ffs-completedproposals" class="ffs-btn" href="/forum-funding-system/completed-proposals/">Completed Proposals</a>
+ <a id="ffs-completedproposals" class="ffs-btn" href="{{site.baseurl}}/forum-funding-system/completed-proposals/">Completed Proposals</a>
</div>
</div>
diff --git a/forum-funding-system/open-tasks/index.html b/forum-funding-system/open-tasks/index.html
index 73ab28d7..c5204d35 100644
--- a/forum-funding-system/open-tasks/index.html
+++ b/forum-funding-system/open-tasks/index.html
@@ -1,6 +1,6 @@
---
layout: custom
-title: Open Tasks
+title: titles.ffs-ot
---
<div class="container ffs-backlink">
diff --git a/forum-funding-system/work-in-progress/index.html b/forum-funding-system/work-in-progress/index.html
index 16725f2f..343e3f92 100644
--- a/forum-funding-system/work-in-progress/index.html
+++ b/forum-funding-system/work-in-progress/index.html
@@ -1,6 +1,6 @@
---
layout: custom
-title: Work in Progress
+title: titles.ffs-wip
---
<div class="container ffs-backlink">
--
GitLab