From b1b968314158be4100f01b25e9a35a20cff86c66 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 8 Mar 2018 12:17:19 +0100
Subject: [PATCH] Add links to FAQ and Privacy in static pages

---
 customize.dist/pages.js                      | 7 ++++++-
 customize.dist/src/less2/pages/page-faq.less | 7 +++++++
 customize.dist/translations/messages.fr.js   | 3 ++-
 customize.dist/translations/messages.js      | 1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index e7982f5e8..a08e40d3c 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -98,9 +98,11 @@ define([
                     ]),
                     h('a.navbar-brand', { href: '/index.html'}),
                 h('div.collapse.navbar-collapse.justify-content-end#menuCollapse', [  
-                    h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad),
+                    //h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad), // Moved the FAQ
+                    h('a.nav-item.nav-link', { href: '/faq.html'}, Msg.faq_link),
                     h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
                     h('a.nav-item.nav-link', { href: '/features.html'}, Msg.features),
+                    h('a.nav-item.nav-link', { href: '/privacy.html'}, Msg.privacy),
                     h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
                     h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
                 ].concat(rightLinks))
@@ -403,6 +405,9 @@ define([
             infopageTopbar(),
             h('div.container.cp-container', [
                 h('center', h('h1', Msg.faq_title)),
+                h('p.cp-faq-header', h('a.nav-item.nav-link', {
+                    href: '/what-is-cryptpad.html'
+                }, Msg.faq_whatis)),
                 h('div.cp-faq-container', categories)
             ]),
             infopageFooter()
diff --git a/customize.dist/src/less2/pages/page-faq.less b/customize.dist/src/less2/pages/page-faq.less
index e24dc767c..99df97f9f 100644
--- a/customize.dist/src/less2/pages/page-faq.less
+++ b/customize.dist/src/less2/pages/page-faq.less
@@ -4,6 +4,13 @@
 .infopages_main();
 .infopages_topbar();
 
+.cp-faq-header {
+    padding: 0;
+    font-size: 1.2em;
+    a {
+        padding: 0;
+    }
+}
 .cp-faq-container {
     .cp-faq-questions-q {
         color: #3a84b6;
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index fca773da3..d4743dc9e 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -672,7 +672,7 @@ define(function () {
     out.footer_aboutUs = "À propos";
 
     out.about = "À propos";
-    out.privacy = "Vie privée";
+    out.privacy = "Confidentialité";
     out.contact = "Contact";
     out.terms = "Conditions";
     out.blog = "Blog";
@@ -759,6 +759,7 @@ define(function () {
 
     out.faq_link = "FAQ";
     out.faq_title = "Foire Aux Questions";
+    out.faq_whatis = "Qu'est-ce que CryptPad ?";
     out.faq = {};
     out.faq.keywords = {
         title: 'Termes spéciaux',
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 5b60b6b0b..92d0c9a26 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -765,6 +765,7 @@ define(function () {
 
     out.faq_link = "FAQ";
     out.faq_title = "Frequently Asked Questions";
+    out.faq_whatis = "What is CryptPad?";
     out.faq = {};
     out.faq.keywords = {
         title: 'Keywords',