Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/pages.js

@@ -571,13 +571,13 @@ define([
         var showingMore = false;
 
         var icons = [
-                [ 'pad', '/pad/', Msg.main_richTextPad, 'fa-file-word-o' ],
+                [ 'pad', '/pad/', Msg.main_richTextPad, 'pad' ],
-                [ 'code', '/code/', Msg.main_codePad, 'fa-file-code-o' ],
+                [ 'code', '/code/', Msg.main_codePad, 'code' ],
-                [ 'slide', '/slide/', Msg.main_slidePad, 'fa-file-powerpoint-o' ],
+                [ 'slide', '/slide/', Msg.main_slidePad, 'slide' ],
-                [ 'poll', '/poll/', Msg.main_pollPad, 'fa-calendar' ],
+                [ 'poll', '/poll/', Msg.main_pollPad, 'poll' ],
-                [ 'kanban', '/kanban/', Msg.main_kanbanPad, 'fa-calendar' ],
+                [ 'kanban', '/kanban/', Msg.main_kanbanPad, 'kanban' ],
-                [ 'whiteboard', '/whiteboard/', Msg.main_whiteboardPad, 'fa-paint-brush' ],
+                [ 'whiteboard', '/whiteboard/', Msg.main_whiteboardPad, 'whiteboard' ],
-                [ 'recent', '/drive/', Msg.main_localPads, 'fa-hdd-o' ]
+                [ 'recent', '/drive/', Msg.main_localPads, 'drive' ]
             ].filter(function (x) {
                 return isAvailableType(x[1]);
             })
@@ -587,7 +587,7 @@ define([
                 return h('a', [
                     { href: x[1] },
                     h(s, [
-                        h('i.fa.' + x[3]),
+                        h('i.fa.' + AppConfig.applicationsIcon[x[3]]),
                         h('div.pad-button-text', [ h('h4', x[2]) ])
                     ])
                 ]);

customize.dist/translations/messages.de.js

@@ -780,7 +780,7 @@
 
     out.faq_link = "FAQ";
     out.faq_title = "Häufigste Fragen";
-    out.faq_whatis = "Was ist CryptPad?";
+    out.faq_whatis = "Was ist <span class='cp-brand-font'>CryptPad</span>?";
     out.faq = {};
     out.faq.keywords = {
         title: 'Schlüsselkonzepte',

customize.dist/translations/messages.fr.js

@@ -675,6 +675,7 @@ define(function () {
     out.main_slidePad = 'Présentation Markdown';
     out.main_pollPad = 'Sondage ou Planning';
     out.main_whiteboardPad = 'Tableau blanc';
+    out.main_kanbanPad = 'Kanban';
     out.main_localPads = 'Pads Locaux';
     out.main_yourCryptDrive = 'Votre CryptDrive';
     out.main_footerText = "Avec CryptPad, vous pouvez créer des documents collaboratifs rapidement pour prendre des notes à plusieurs.";

customize.dist/translations/messages.js

@@ -680,6 +680,7 @@ define(function () {
     out.main_slidePad = 'Markdown Presentation';
     out.main_pollPad = 'Poll or Schedule';
     out.main_whiteboardPad = 'Whiteboard';
+    out.main_kanbanPad = 'Kanban';
     out.main_localPads = 'Local Pads';
     out.main_yourCryptDrive = 'Your CryptDrive';
     out.main_footerText = "With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.";

www/common/application_config_internal.js

@@ -81,7 +81,8 @@ define(function() {
         whiteboard: 'fa-paint-brush',
         todo: 'fa-tasks',
         contacts: 'fa-users',
-        kanban: 'fa-list-alt',
+        kanban: 'fa-columns',
+        drive: 'fa-hdd-o',
     };
 
     // Ability to create owned pads and expiring pads through a new pad creation screen.