Merge branch 'refs/heads/ninja-internal' into ToolFixes

2 files changed, 7 insertions, 3 deletions

diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index af7c4858..a8546662 100644
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -92,7 +92,11 @@ exports.StageController = Montage.create(ElementController, {
 
     setProperty: {
         value: function(el, p, value) {
+
             switch(p) {
+                case "body-background":
+                    el.elementModel.body.style.setProperty("background", value);
+                    break;
                 case "background":
                     el.elementModel.stageBackground.style.setProperty(p, value);
                     break;
diff --git a/js/controllers/main-menu-controller.js b/js/controllers/main-menu-controller.js
index 5e126617..2b848b9f 100644
--- a/js/controllers/main-menu-controller.js
+++ b/js/controllers/main-menu-controller.js
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
+    Component = require("montage/ui/component").Component,
+    AboutBoxPopup = require("js/components/about-box.reel").AboutBox;
 
 exports.MainMenuController = Montage.create(Component, {
     deserializedFromTemplate:{
@@ -36,8 +37,7 @@ exports.MainMenuController = Montage.create(Component, {
     },
     handleExecuteHelpAbout:{
         value:function () {
-            // TODO
-            console.log("Pull up the about popup");
+            AboutBoxPopup.show();
         }
     }
 });