Merge pull request #2294 from shashankmehta/apps-config

Shifts app UI behind config option

core/client/views/settings.js

@@ -38,6 +38,11 @@
         initialize: function (options) {
             this.render();
             this.menu = this.$('.settings-menu');
+            // Hides apps UI unless config.js says otherwise
+            // This will stay until apps UI is ready to ship
+            if ($(this.el).attr('data-apps') !== "true") {
+                this.menu.find('.apps').hide();
+            }
             this.showContent(options.pane);
         },
 

core/server/helpers/index.js

@@ -326,6 +326,20 @@ coreHelpers.file_storage = function (context, options) {
     return "true";
 };
 
+// ### Apps helper
+//
+// *Usage example:*
+// `{{apps}}`
+//
+// Returns the config value for apps.
+coreHelpers.apps = function (context, options) {
+    /*jslint unparam:true*/
+    if (config().hasOwnProperty('apps')) {
+        return config().apps.toString();
+    }
+    return "false";
+};
+
 coreHelpers.ghost_script_tags = function () {
     var scriptList = isProduction ? scriptFiles.production : scriptFiles.development;
 
@@ -786,6 +800,8 @@ registerHelpers = function (adminHbs, assetHash) {
 
     registerAdminHelper('file_storage', coreHelpers.file_storage);
 
+    registerAdminHelper('apps', coreHelpers.apps);
+
     registerAdminHelper('admin_url', coreHelpers.admin_url);
 
     registerAsyncAdminHelper('update_notification', coreHelpers.update_notification);

core/server/views/settings.hbs

@@ -1,6 +1,6 @@
 {{!< default}}
 <div class="wrapper">
-    <aside class="settings-sidebar" role="complementary">
+    <aside class="settings-sidebar" role="complementary" data-apps={{apps}}>
 
     </aside>