Merge pull request #392 from joseeight/Document

New: Improved layout of components for breadcrumb and UI buttons for views

3 files changed, 10 insertions, 19 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index 2dd34af3..a80b6052 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -37,15 +37,13 @@ POSSIBILITY OF SUCH DAMAGE.
     -webkit-box-flex: 0;
 }
 
-.mainContentContainer > section.breadcrumbTrail {
+.mainContentContainer section.breadcrumbTrail {
     border:0;
     margin:0;
     border-bottom:1px solid #000;
     margin-bottom:1px;
 }
-.breadcrumbTrail button.nj-skinned {
-    float: left;
-    width: 60px;
-    margin: 2px;
-}
 
+.breadcrumbTrail div:first-child {
+    margin-left: 2px;
+}
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 19707632..2c6d941f 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -40,22 +40,15 @@ POSSIBILITY OF SUCH DAMAGE.
                 "owner": {
                     "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]",
                     "properties": {
-                        "element": {"#": "breadcrumbTrail"},
-                        "breadcrumbBt": {"@": "breadCrumbButton"}
+                        "element": {"#": "breadcrumbTrail"}
                     }
                 },
 
-                "breadCrumbButton": {
-                    "prototype": "montage/ui/native/button.reel",
+                "breadcrumbButton": {
+                    "prototype": "js/components/layout/bread-crumb-button.reel",
                     "properties": {
-                        "element": {"#": "breadcrumb_button"}
+                        "element": {"#": "breadcrumbButton"}
                     },
-                    "listeners": [
-                        {
-                            "type": "action",
-                            "listener": {"@": "owner"}
-                        }
-                    ],
                     "bindings": {
                         "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
                         "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
@@ -94,7 +87,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
         <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail">
             <div data-montage-id="breadcrumb_container">
-                <button data-montage-id="breadcrumb_button" class="nj-skinned"></button>
+                <div data-montage-id="breadcrumbButton"></div>
             </div>
             <div data-montage-id="disabledCondition" class="panelDisabled"></div>
         </section>
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 40494bc3..efa0dfd5 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -87,7 +87,7 @@ exports.Breadcrumb = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            this.breadcrumbBt.addEventListener("action", this, false);
+            this.addEventListener("action", this, false);
             this.addPropertyChangeListener("currentDocument.model.domContainer", this)
         }
     },