Merge branch 'refs/heads/Jose-Document' into Document

3 files changed, 49 insertions, 4 deletions

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 fbd03221..3e3ac936 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -68,6 +68,15 @@ POSSIBILITY OF SUCH DAMAGE.
                         "condition": {"<-": "@owner.disabled"}
                     }
                 },
+
+                "menuItemButton": {
+                    "prototype": "montage/ui/native/button.reel",
+                    "properties": {
+                        "element": {"#": "previewButton"},
+                        "identifier": "preview",
+                        "label": "Preview"
+                    }
+                },
     
                 "owner": {
                     "prototype": "js/components/layout/document-bar.reel",
@@ -75,7 +84,8 @@ POSSIBILITY OF SUCH DAMAGE.
                         "element": {"#": "documentBar"},
                         "zoomControl": {"@": "hottext1"},
                         "btnDesign": {"#": "buttonDesign"},
-                        "btnCode": {"#": "buttonCode"}
+                        "btnCode": {"#": "buttonCode"},
+                        "btnPreview": {"#": "buttonPreview"}
                     }
                 }
             }
@@ -110,6 +120,14 @@ POSSIBILITY OF SUCH DAMAGE.
                 <button class="btn_view">Code</button>
                 
             </section>
+
+            <section data-montage-id="buttonPreview" 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 194b9b23..803d2c3a 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -86,6 +86,17 @@ exports.DocumentBar = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
+    btnCode: {
+        value: null
+    },
+    btnDesign: {
+        value: null
+    },
+    btnPreview: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     _visible: {
         value: false
     },
@@ -139,6 +150,7 @@ exports.DocumentBar = Montage.create(Component, {
             //
             this.btnCode.addEventListener('click', this.showViewCode.bind(this), false);
             this.btnDesign.addEventListener('click', this.showViewDesign.bind(this), false);
+            this.btnPreview.addEventListener('click', this, false);
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -241,9 +253,15 @@ exports.DocumentBar = Montage.create(Component, {
                 render();
             }
         }
+    },
+
+    handleClick: {
+        value: function(evt) {
+            NJevent("executePreview");
+        }
     }
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
\ No newline at end of file
+////////////////////////////////////////////////////////////////////////