From db0d2e161cf7e4ad3b2591f89d7fefe1cb4617fd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 12 Jan 2018 14:50:39 +0100
Subject: [PATCH] Hide pad creation screen features if it is disabled in app
 config

---
 customize.dist/translations/messages.fr.js |  2 +-
 www/common/toolbar3.js                     | 23 ++++++++++++++--------
 www/settings/inner.js                      |  8 +++++++-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 11839b5b5..8ff3c8de7 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -803,7 +803,7 @@ define(function () {
     // Properties about creation data
     out.creation_owners = "Propriétaires";
     out.creation_ownedByOther = "Possédé par un autre utilisateur";
-    out.creation_noOwner = "Pad de propriétaire";
+    out.creation_noOwner = "Pas de propriétaire";
     out.creation_expiration = "Date d'expiration";
     out.creation_propertiesTitle = "Disponibilité";
     out.creation_appMenuName = "Mode avancé (Ctrl + E)";
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 406863109..c8aa2f901 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -933,14 +933,21 @@ define([
                 content: $('<div>').append(UI.getIcon(p)).html() + Messages.type[p]
             });
         });
-        pads_options.push({
-            tag: 'a',
-            attributes: {
-                id: 'cp-app-toolbar-creation-advanced',
-                href: origin
-            },
-            content: '<span class="fa fa-plus-circle"></span> ' + Messages.creation_appMenuName
-        });
+        if (Config.displayCreationScreen) {
+            pads_options.push({
+                tag: 'a',
+                attributes: {
+                    id: 'cp-app-toolbar-creation-advanced',
+                    href: origin
+                },
+                content: '<span class="fa fa-plus-circle"></span> ' + Messages.creation_appMenuName
+            });
+            $(window).keydown(function (e) {
+                if (e.which === 69 && e.ctrlKey) {
+                    Common.createNewPadModal();
+                }
+            });
+        }
         var dropdownConfig = {
             text: '', // Button initial text
             options: pads_options, // Entries displayed in the menu
diff --git a/www/settings/inner.js b/www/settings/inner.js
index eff31a4fa..9190686c7 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -9,6 +9,7 @@ define([
     '/common/common-hash.js',
     '/customize/messages.js',
     '/common/hyperscript.js',
+    '/customize/application_config.js',
 
     '/bower_components/file-saver/FileSaver.min.js',
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
@@ -24,7 +25,8 @@ define([
     Util,
     Hash,
     Messages,
-    h
+    h,
+    AppConfig
     )
 {
     var saveAs = window.saveAs;
@@ -65,6 +67,10 @@ define([
         ]
     };
 
+    if (!AppConfig.dislayCreationScreen) {
+        delete categories.creation;
+    }
+
     var create = {};
 
     // Account settings