45 files changed, 1109 insertions, 17 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 682dfc9d..34b0b296 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #sceneBar { height: 70px; background-color: #474747; }
 
-#mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; }
+#mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; }
 
-.rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; }
+.rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; }
 
 #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
 
@@ -867,6 +867,8 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); }
 
+.bindingTool { background-image: url("../images/tools/binding.png"); }
+
 .blueDiv { background: blue; opacity: 0.2; }
 
 ::-webkit-scrollbar { width: 11px; height: 11px; }
@@ -941,4 +943,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .montage-invisible { display: none; }
 
+.panels .panel { display: none; }
+
+.panels .panel.ws-binding { display: none; -webkit-box-flex-group: 2; }
+
+body.ws-binding .panel.ws-binding { display: -webkit-box; }
+
+body.ws-default .panel.default { display: -webkit-box; -webkit-box-flex-group: 1; }
+
 /*77*/
diff --git a/images/cursors/binding.png b/images/cursors/binding.png
new file mode 100644
index 00000000..16e84574
--- /dev/null
+++ b/images/cursors/binding.png
diff --git a/images/tools/binding.png b/images/tools/binding.png
new file mode 100644
index 00000000..33545ee1
--- /dev/null
+++ b/images/tools/binding.png
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index df603bf8..dec37a84 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -95,6 +95,9 @@
             "ZoomTool1": {
                 "prototype": "js/tools/ZoomTool"
             },
+            "BindingTool1": {
+                "prototype": "js/tools/BindingTool"
+            },
 
             "disable": {
                 "prototype": "montage/ui/condition.reel",
@@ -131,6 +134,7 @@
                     "RotateStageTool3D":      {"@": "RotateStageTool3D1"},
                     "PanTool":                {"@": "PanTool1"},
                     "ZoomTool":               {"@": "ZoomTool1"},
+                    "bindingTool":            {"@": "BindingTool1"},
                     "components": [
                         {"@": "repetition1"}
                     ]
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index e7d1ac8b..ffaa0fca 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -102,6 +102,12 @@
                     "element": {"#": "zoomProperties"}
                 }
             },
+            "bindingProperties1": {
+                "prototype": "js/components/tools-properties/binding-properties.reel",
+                "properties": {
+                    "element": {"#": "bindingProperties"}
+                }
+            },
 
             "disable": {
                 "prototype": "montage/ui/condition.reel",
@@ -134,7 +140,8 @@
                     "eraserProperties":             {"@": "eraserProperties1"},
                     "rotateStageProperties":        {"@": "rotateStageProperties1"},
                     "panProperties":                {"@": "panProperties1"},
-                    "zoomProperties":               {"@": "zoomProperties1"}
+                    "zoomProperties":               {"@": "zoomProperties1"},
+                    "bindingProperties":            {"@": "bindingProperties1"}
                 },
                 "bindings": {
                     "currentSelectedTool": {
@@ -164,6 +171,7 @@
             <div data-montage-id="rotateStageProperties"></div>
             <div data-montage-id="panProperties"></div>
             <div data-montage-id="zoomProperties"></div>
+            <div data-montage-id="bindingProperties"></div>
             <div data-montage-id="disabledCondition" class="panelDisabled"></div>
         </div>
     </body>
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.css b/js/components/tools-properties/binding-properties.reel/binding-properties.css
new file mode 100755
index 00000000..19d2b6c6
--- /dev/null
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.css
@@ -0,0 +1,17 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+.bindingSubTools {
+    padding:9px;
+    font-size:12px;
+}
+
+.bindingSubTools label {
+
+}
+.bindingSubTools input[type=checkbox] {
+    margin: 0px 3px;
+}
\ No newline at end of file
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html
new file mode 100755
index 00000000..cd0e0a50
--- /dev/null
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html>