Merge branch 'templates' into staging

2017-04-10 14:19:48 +02:00
parent 63a130c678 bd16e0f0e7
commit cfc5d634f4
11 changed files with 194 additions and 7 deletions
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -220,6 +220,7 @@ define([
        // Categories dislayed in the menu
        // _WORKGROUP_ : do not display unsorted
        var displayedCategories = [ROOT, UNSORTED, TRASH, SEARCH];
+        if (AppConfig.enableTemplates) { displayedCategories.push(TEMPLATE); }
        if (isWorkgroup()) { displayedCategories = [ROOT, TRASH, SEARCH]; }

        var lastSelectTime;