Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 16 insertions, 3 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 2c5617e5..5996e446 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -136,6 +136,21 @@
                 "name": "ZoomTool"
             },
 
+            "disable": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
+            },
+
             "owner": {
                 "module": "js/components/layout/tools-list.reel",
                 "name": "ToolsList",
@@ -166,9 +181,6 @@
                     ]
                 }
             }
-
-
-
         }
             </script>
 
@@ -184,6 +196,7 @@
             </div>
             <!-- TODO: Remove and add as a component -->
             <div id="colortoolbar"></div>
+            <div id="disabledCondition" class="panelDisabled"></div>
         </div>
 
     </body>