Merge branch 'refs/heads/master' into PresetsPanel

2 files changed, 21 insertions, 26 deletions

diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index e9e47dc0..34adc82d 100644
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -10,7 +10,7 @@ exports.MenuData = Montage.create( Montage, {
     topLevelMenu: {
         value: [
             {
-                "header": "FILE",
+                "header": "File",
                 "entries": [
                     {
                         "displayText" : "New Project",
@@ -71,7 +71,7 @@ exports.MenuData = Montage.create( Montage, {
                 ]
             },
             {
-                "header": "EDIT",
+                "header": "Edit",
                 "entries": [
                     {
                         "displayText" : "Undo",
@@ -111,7 +111,7 @@ exports.MenuData = Montage.create( Montage, {
                 ]
             },
             {
-                "header": "VIEW",
+                "header": "View",
                 "entries": [
                     {
                         "displayText" : "Zoom In",
@@ -282,7 +282,7 @@ exports.MenuData = Montage.create( Montage, {
                 ]
             },
             {
-                "header": "WINDOW",
+                "header": "Window",
                 "entries": [
                     {
                         "displayText" : "Tools",
@@ -356,41 +356,34 @@ exports.MenuData = Montage.create( Montage, {
                 ]
             },
             {
-                "header": "HELP",
+                "header": "Help",
                 "entries": [
                     {
-                        "displayText" : "About",
+                        "displayText" : "Ninja FAQ",
                         "hasSubMenu" : false,
-                        "enabled": true
+                        "enabled": true,
+                        "action":   "executeHelpFAQ"
                     },
                     {
-                        "displayText" : "FAQ",
+                        "displayText" : "Ninja Forums",
                         "hasSubMenu" : false,
-                        "enabled": true
+                        "enabled": true,
+                        "action":   "executeHelpForums"
                     },
                     {
-                        "displayText" : "Forums",
+                        "displayText" : "Help Topics",
                         "hasSubMenu" : false,
-                        "enabled": true
-                    }
-                ]
-            },
-            {
-                "header": "TEST",
-                "entries": [
-                    {
-                        "displayText" : "Open CSS View",
-                        "hasSubMenu" : false,
-                        "enabled": true
+                        "enabled": true,
+                        "action":   "executeHelpTopics"
                     },
                     {
-                        "displayText" : "Open JS View",
+                        "displayText" : "About Ninja...",
                         "hasSubMenu" : false,
-                        "enabled": true
+                        "enabled": true,
+                        "action":   "executeHelpAbout"
                     }
                 ]
             }
-
         ]
     }
 });
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 10b33a0e..8ffd0ec7 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -459,12 +459,14 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type: "dropdown",
-                            id:   "stroke",
+                            id:   "strokeMaterial",
+                            prop:   "strokeMaterial",
                             label: "Stroke",
                             labelField: "_name",
                             dataField: "_name",
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
-                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
+                            divider : true
                         }
                     ]
                 ]