Merge branch 'menu-fixes' of https://github.com/mencio/ninja into v0.7.1

24 files changed, 1041 insertions, 1205 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 288156b6..bc82f50d 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -98,7 +98,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #appWorkspace { display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; -webkit-box-align: center; -webkit-box-sizing: stretch; position: relative; padding: 2px 0px; border: 1px solid #333; overflow: hidden; }
 
-#topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 6995; }
+#topMenu { background-color: #474747; position: absolute; height: 26px; width: 100%; top: 0px; left: 0px; z-index: 6995; }
 
 #topPanelContainer, #leftPanelContainer, #rightPanelContainer, .timelinePanel { background-color: #282828; }
 
diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index b86855b7..5eba72e8 100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -75,7 +75,7 @@ POSSIBILITY OF SUCH DAMAGE.
     padding: 0;
     border: none;
     color: #FFF;
-    width: 44px;
+    width: 46px;
     text-transform: uppercase;
     text-align: left;
     float: left;
@@ -83,6 +83,10 @@ POSSIBILITY OF SUCH DAMAGE.
     font-size: 11px;
 }
 
+.preview:focus {
+    -webkit-box-shadow: none;
+}
+
 .documentBar .viewicon {
     background-repeat: no-repeat;
     background-position: center center;
@@ -98,10 +102,15 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 
 .documentBar .viewdesign {
-    background-image: url('../../../../js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png');
+    background-image: url('../../../../js/panels/color/colorpanelpopup.reel/img/icon_bitmap.png');
     background-size: 90%;
 }
 
+.documentBar .viewPreview {
+    background-image: url('../../../../images/optionsbar/edit_mode.png');
+    background-size: 100%;
+}
+
 .documentBar section.inactive .viewicon{
     opacity: .5;
 }
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 69f8107f..9e5e4eb2 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -68,6 +68,21 @@ POSSIBILITY OF SUCH DAMAGE.
                         "condition": {"<-": "@owner.disabled"}
                     }
                 },
+
+                "menuItemButton": {
+                    "prototype": "montage/ui/native/button.reel",
+                    "properties": {
+                        "element": {"#": "previewButton"},
+                        "identifier": "preview",
+                        "label": "Preview"
+                    },
+                    "listeners": [
+                        {
+                            "type": "action",
+                            "listener": {"@": "owner"}
+                        }
+                    ]
+                },
     
                 "owner": {
                     "prototype": "js/components/layout/document-bar.reel",
@@ -108,6 +123,14 @@ POSSIBILITY OF SUCH DAMAGE.
                 <button class="btn_view">Code</button>
                 
             </section>
+
+            <section class="inactive">
+
+                <div class="viewicon viewPreview"></div>
+
+                <button data-montage-id="previewButton" class="btn_view preview"></button>
+
+            </section>
         
             <div data-montage-id="disabledCondition" class="panelDisabled"></div>
         
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 248bc8c4..fa0c8788 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -203,5 +203,11 @@ exports.DocumentBar = Montage.create(Component, {
             this.currentView = event._event.target.id;
             this.application.ninja.documentController.stage.stageView.switchDesignDocViews(event._event.target.id);//switch between design view
         }
+    },
+
+    handlePreviewAction: {
+        value: function(event) {
+            NJevent("executePreview");
+        }
     }
 });
diff --git a/js/components/layout/stage-mode.reel/stage-mode.css b/js/components/layout/stage-mode.reel/stage-mode.css
deleted file mode 100755
index c50679e8..00000000
--- a/js/components/layout/stage-mode.reel/stage-mode.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/* <copyright>
-Copyright (c) 2012, Motorola Mobility LLC.
-All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of Motorola Mobility LLC nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
-
-.stageMode {
-    width:26px;
-    height:23px;
-    position:absolute;
-    top:5px;
-    right:60px;
-
-    opacity: 0.7;
-    background-repeat:no-repeat;
-}
-
-.editMode {
-    background-image: url('../../../../images/optionsbar/edit_mode.png');
-}
-
-.liveMode {
-    background-image: url('../../../../images/optionsbar/live_mode.png');
-}
diff --git a/js/components/layout/stage-mode.reel/stage-mode.html b/js/components/layout/stage-mode.reel/stage-mode.html
deleted file mode 100755
index fb6a26b0..00000000
--- a/js/components/layout/stage-mode.reel/stage-mode.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>