From aa9e0d3cd387813b10eb957f62207fcde115d625 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 21 Aug 2017 18:30:51 +0200
Subject: [PATCH] Enable AppConfig in pad2

---
 www/common/sframe-common.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 121ad8105..cfcf5722d 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -8,8 +8,10 @@ define([
     '/common/sframe-common-history.js',
     '/common/metadata-manager.js',
 
+    '/customize/application_config.js',
     '/common/cryptpad-common.js'
-], function (nThen, Messages, CpNfInner, SFrameChannel, Title, UI, History, MetadataMgr, Cryptpad) {
+], function (nThen, Messages, CpNfInner, SFrameChannel, Title, UI, History, MetadataMgr,
+    AppConfig, Cryptpad) {
 
     // Chainpad Netflux Inner
     var funcs = {};
@@ -138,7 +140,7 @@ define([
                 }
                 break;
             case 'template':
-                //if (!AppConfig.enableTemplates) { return; }
+                if (!AppConfig.enableTemplates) { return; }
                 button = $('<button>', {
                     title: Messages.saveTemplateButton,
                 }).append($('<span>', {'class':'fa fa-bookmark', style: 'font:'+size+' FontAwesome'}));
@@ -214,10 +216,10 @@ define([
                 }
                 break;
             case 'history':
-                /*if (!AppConfig.enableHistory) {
+                if (!AppConfig.enableHistory) {
                     button = $('<span>');
                     break;
-                }*/
+                }
                 button = $('<button>', {
                     title: Messages.historyButton,
                     'class': "fa fa-history history",