From 96f6b5755daaa61639fbcfc946b32ff08d595e49 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 28 Feb 2017 10:39:48 +0100
Subject: [PATCH] Add the blog link in the header and footer

---
 customize.dist/about.html                  | 4 ++++
 customize.dist/contact.html                | 4 ++++
 customize.dist/index.html                  | 4 ++++
 customize.dist/privacy.html                | 4 ++++
 customize.dist/src/fragments/footer.html   | 1 +
 customize.dist/src/fragments/topbar.html   | 3 +++
 customize.dist/terms.html                  | 4 ++++
 customize.dist/translations/messages.fr.js | 3 ++-
 customize.dist/translations/messages.js    | 1 +
 www/settings/index.html                    | 4 ++++
 10 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/customize.dist/about.html b/customize.dist/about.html
index 8a1851f10..9d8b76084 100644
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@@ -44,6 +44,9 @@
     <span class="link right">
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
+    <span class="link right">
+        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
+    </span>
 </div>
 
 
@@ -103,6 +106,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_aboutUs"><li>
+                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
                             <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
diff --git a/customize.dist/contact.html b/customize.dist/contact.html
index 1242f1058..d5281d398 100644
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@@ -44,6 +44,9 @@
     <span class="link right">
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
+    <span class="link right">
+        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
+    </span>
 </div>
 
 
@@ -100,6 +103,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_aboutUs"><li>
+                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
                             <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
diff --git a/customize.dist/index.html b/customize.dist/index.html
index b2155253e..03809f4b0 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -44,6 +44,9 @@
     <span class="link right">
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
+    <span class="link right">
+        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
+    </span>
 </div>
 
 
@@ -222,6 +225,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_aboutUs"><li>
+                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
                             <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index da7887b23..863865de5 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -44,6 +44,9 @@
     <span class="link right">
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
+    <span class="link right">
+        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
+    </span>
 </div>
 
 
@@ -122,6 +125,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_aboutUs"><li>
+                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
                             <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
diff --git a/customize.dist/src/fragments/footer.html b/customize.dist/src/fragments/footer.html
index 80471d5c0..de089102d 100644
--- a/customize.dist/src/fragments/footer.html
+++ b/customize.dist/src/fragments/footer.html
@@ -22,6 +22,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_aboutUs"><li>
+                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
                             <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
diff --git a/customize.dist/src/fragments/topbar.html b/customize.dist/src/fragments/topbar.html
index b68570bad..a6b459b35 100644
--- a/customize.dist/src/fragments/topbar.html
+++ b/customize.dist/src/fragments/topbar.html
@@ -21,4 +21,7 @@
     <span class="link right">
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
+    <span class="link right">
+        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
+    </span>
 </div>
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index 5a9238143..5af11dc9d 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -44,6 +44,9 @@
     <span class="link right">
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
+    <span class="link right">
+        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
+    </span>
 </div>
 
 
@@ -104,6 +107,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_aboutUs"><li>
+                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
                             <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 12b538abf..fef399488 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -290,12 +290,13 @@ define(function () {
 
     out.footer_applications = "Applications";
     out.footer_contact = "Contact";
-    out.footer_aboutUs = "À propos de nous";
+    out.footer_aboutUs = "À propos";
 
     out.about = "À propos";
     out.privacy = "Vie privée";
     out.contact = "Contact";
     out.terms = "Conditions";
+    out.blog = "Blog";
 
     // privacy.html
 
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index c732d8de9..959226a77 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -300,6 +300,7 @@ define(function () {
     out.privacy = "Privacy";
     out.contact = "Contact";
     out.terms = "ToS";
+    out.blog = "Blog";
 
     // privacy.html
 
diff --git a/www/settings/index.html b/www/settings/index.html
index ec1843747..69c8acd14 100644
--- a/www/settings/index.html
+++ b/www/settings/index.html
@@ -45,6 +45,9 @@
     <span class="link right">
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
+    <span class="link right">
+        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
+    </span>
 </div>
 
 
@@ -95,6 +98,7 @@
                     <div class="col">
                         <ul class="list-unstyled">
                             <li class="title" data-localization="footer_aboutUs"><li>
+                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
                             <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>