10 files changed, 173 insertions, 85 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 34b0b296..8139375d 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -198,7 +198,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #iframeContainer { position: absolute; top: 0px; left: 0px; margin: 0px; padding: 0px; width: 100%; height: 100%; overflow: scroll; background: gray; }
 
-.drawingCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 6; }
+.drawingCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 7; }
 
 .stageCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 5; }
 
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
index 07cbff11..78189415 100755
--- a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
+++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
@@ -12,30 +12,53 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.BindingHudOption = Montage.create(Component, {
+    _title: {
+        value: null
+    },
+
     title: {
-        value: "value"
+        get: function() {
+            return this._title;
+        },
+        set: function(val) {
+            this._title = val;
+            this.needsDraw = true;
+        }
     },
-    _bindings: {
+
+    bound: {
+        value: false
+    },
+
+    _hudOptions: {
         value: []
     },
 
-    bindings: {
+    hudOptions: {
         get: function() {
-            return this._bindings;
+            return this._hudOptions;
         },
         set: function(val) {
-            this._bindings = val;
+            this._hudOptions = val;
+            this.title = val.title;
+            this.bound = val.bound;
             this.needsDraw = true;
         }
     },
 
     draw: {
         value:function() {
-            if(this.bindings.length > 0) {
+            if(this.bound) {
+                console.log(this.title);
                 this.element.classList.add("bound");
             } else {
                 this.element.classList.remove("bound");
             }
+//            if(this.bindings.length > 0) {
+//                this.element.classList.add("bound");
+//            } else {
+//                this.element.classList.remove("bound");
+//            }
         }
     }
 });
\ No newline at end of file
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
index 34f14a5a..aa204be7 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
@@ -6,7 +6,7 @@
 
 .bindingHud {
     position: absolute;
-    background: #282828;
+    background: rgba(0, 0, 0, 0.8);
     padding: 0px;
     color: #FFF;
     font-size: 11px;
@@ -15,6 +15,7 @@
     padding: 3px;
     padding-top:0px;
     border:1px solid #000;
+    text-shadow: 1px 1px 0px #000;
 }
 
 .bindingHud .bindingTitle {
@@ -27,9 +28,8 @@
 }
 
 .bindingHud .hudRepetition {
-    background: #555;
+    background: rgba(0, 0, 0, 0.3);
     line-height:16px;
-    border:1px solid #000;
     box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;
     min-width: 80px;
 }
@@ -41,7 +41,8 @@
     padding:1px 9px;
 }
 .hudOption.bound, .bindingHud .hudOption.bound .connectorBubble {
-    background-color:#44F;
+    background: #5e9eff;
+    display:block;
 }
 
 .bindingHud .hudOption:last-child {
@@ -50,14 +51,14 @@
 
 .bindingHud .hudOption .connectorBubble {
     position: absolute;
-    right: -11px;
-    top: 2px;
-    background: #555;
-    border: 1px solid black;
-    border-radius: 0px;
-    width: 12px;
-    height: 12px;
+    right: -10px;
+    top: 1px;
+    background: rgba(0, 0, 0, 0.3);
+    border-radius: 50%;
+    width: 16px;
+    height: 16px;
     border-left: 0px;
+    display: none;
     /*border-bottom-right-radius: 50%;
     border-top-right-radius: 50%;*/
 
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
index 5e37cfc9..afa4cd47 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
@@ -14,7 +14,8 @@
             "owner": {
                 "prototype": "js/stage/binding-view.reel/binding-hud.reel",
                 "properties": {
-                    "element": {"#": "bindingHud"}
+                    "element": {"#": "bindingHud"},
+                    "titleElement": {"#": "title"}
                 }
             },
             "repeater": {
@@ -32,17 +33,7 @@
                     "element": {"#" : "hudOption"}
                 },
                 "bindings": {
-                    "title": {"<-": "@repeater.objectAtCurrentIteration.title"},
-                    "bindings": {"<-": "@repeater.objectAtCurrentIteration.bindings"}
-                }
-            },
-            "Title": {
-                "prototype": "montage/ui/dynamic-text.reel",
-                "properties": {
-                    "element": {"#": "title"}
-                },
-                "bindings": {
-                    "value": {"<-": "@owner.title"}
+                    "hudOptions": {"<-": "@repeater.objectAtCurrentIteration"}
                 }
             }
         }
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
index 029a1a39..14347a32 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
@@ -12,13 +12,30 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.BindingHud = Montage.create(Component, {
-    title: {
-        value: "default"
+    _bindingArgs: {
+        value: null