47 files changed, 363 insertions, 145 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 4d450208..f085f6be 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -212,6 +212,10 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; }
 
+.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
+
+.montage-editor { padding: 0px; word-wrap: normal; }
+
 .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; }
 
 .panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; }
@@ -888,49 +892,34 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 /*width: 26px;*/
 /*opacity: 0.7;*/
 /*}*/
-/*//  Selection Tool Options  */
-/*.topAlignUp {*/
-/*@include background-pos(8,2,26px,23px);*/
-/*}*/
-/*.rightAlignUp {*/
-/*@include background-pos(9,2,26px,23px);*/
-/*}*/
-/*.bottomAlignUp {*/
-/*@include background-pos(10,2,26px,23px);*/
-/*}*/
-/*.verticalLeftUp {*/
-/*@include background-pos(11,2,26px,23px);*/
-/*}*/
-/*.verticalCenterUp {*/
-/*@include background-pos(12,2,26px,23px);*/
-/*}*/
-/*.verticalRightUp {*/
-/*@include background-pos(13,2,26px,23px);*/
-/*}*/
-/*.distRightUp {*/
-/*@include background-pos(0,3,26px,23px);*/
-/*}*/
-/*.distLeftUp {*/
-/*@include background-pos(14,2,26px,23px);*/
-/*}*/
-/*.distCenterUp {*/
-/*@include background-pos(2,3,26px,23px);*/
-/*}*/
-/*.distTopUp {*/
-/*@include background-pos(1,3,26px,23px);*/
-/*}*/
-/*.distBottomUp {*/
-/*@include background-pos(3,3,26px,23px);*/
-/*}*/
-/*.distVCenterUp {*/
-/*@include background-pos(15,2,26px,23px);*/
-/*}*/
-/*.bucketToolUp {*/
-/*@include background-pos(11,0,26px,23px);*/
-/*}*/
-/*.pencilToolUp {*/
-/*@include background-pos(9,1,26px,23px);*/
-/*}*/
+.topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.verticalRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.distRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -81px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.distLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.distCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -81px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.distTopUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -81px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.distBottomUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -81px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.distVCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.bucketToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px 0px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
+.pencilToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -27px; background-repeat: no-repeat; height: 23px; width: 26px; }
+
 .blueDiv { background: blue; opacity: 0.2; }
 
 ::-webkit-scrollbar { width: 11px; height: 11px; }
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 1d0ad776..9c8946c4 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -1,3 +1,9 @@
+/* <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> */
+
 /* ComputedStyleSubPanel.js */
 var Montage   = require("montage").Montage,
     Component = require("montage/ui/component").Component;
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 79813c92..5ed46b3c 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -1,3 +1,9 @@
+/* <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> */
+
 /* ComputedStyleSubPanel.js */
 var Montage   = require("montage").Montage,
     Component = require("montage/ui/component").Component,
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 1290aaac..1824c7c3 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -1,3 +1,8 @@
+/* <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> */
 
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 00de9236..cf48757d 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -153,21 +153,21 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "FillTool",
                 "toolTip":      "Fill Tool",
                 "cursor":       "url('images/tools/bucket_down.png'), default",
+                "lastInGroup":  false,
+                "container":    false,
+                "selected":     false
+            },
+            {
+                "id":           "InkBottleTool",
+                "properties":   "inkbottleProperties",
+                "spriteSheet":  true,
+                "action":       "InkBottleTool",
+                "toolTip":      "Ink Bottle Tool",
+                "cursor":       "url('images/tools/inkbottle_down.png'), default",
                 "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },