sync

[roojs1] / Roo / bootstrap / NavProgressBar.js

diff --git a/Roo/bootstrap/NavProgressBar.js b/Roo/bootstrap/NavProgressBar.js
index cce4bd0..edd8d43 100644 (file)
--- a/Roo/bootstrap/NavProgressBar.js
+++ b/Roo/bootstrap/NavProgressBar.js
@@ -11,7 +11,7 @@
  * Bootstrap NavProgressBar class
  * 
  * @constructor
- * Create a new nav progress bar
+ * Create a new nav progress bar - a bar indicating step along a process
  * @param {Object} config The config object
  */
 
@@ -35,7 +35,10 @@ Roo.bootstrap.NavProgressBar = function(config){
 };
 
 Roo.extend(Roo.bootstrap.NavProgressBar, Roo.bootstrap.Component,  {
-    
+    /**
+     * @cfg {Roo.bootstrap.NavProgressItem} NavProgressBar:bullets[]
+     * Bullets for the Nav Progress bar for the toolbar
+     */
     bullets : [],
     barItems : [],
     
@@ -49,22 +52,22 @@ Roo.extend(Roo.bootstrap.NavProgressBar, Roo.bootstrap.Component,  {
             cn : [
                 {
                     tag : 'div',
-                    cls : 'roo-navigation-bar-top'
+                    cls : 'roo-navigation-top-bar'
                 },
                 {
                     tag : 'div',
-                    cls : 'roo-navigation-bar',
+                    cls : 'roo-navigation-bullets-bar',
                     cn : [
                         {
                             tag : 'ul',
-                            cls : 'roo-navigation-bar-list'
+                            cls : 'roo-navigation-bar'
                         }
                     ]
                 },
                 
                 {
                     tag : 'div',
-                    cls : 'roo-navigation-bar-bottom'
+                    cls : 'roo-navigation-bottom-bar'
                 }
             ]
             
@@ -76,9 +79,6 @@ Roo.extend(Roo.bootstrap.NavProgressBar, Roo.bootstrap.Component,  {
     
     initEvents: function() 
     {
-//        this.topEl = this.el.select('.roo-navigation-bar-top', true).first();
-//        this.iconEl = this.el.select('.roo-navigation-bar-list', true).first();
-//        this.bottomEl = this.el.select('.roo-navigation-bar-bottom', true).first();
         
     },
     
@@ -92,6 +92,8 @@ Roo.extend(Roo.bootstrap.NavProgressBar, Roo.bootstrap.Component,  {
             }, this);
         }
         
+        this.format();
+        
     },
     
     addItem : function(cfg)
@@ -99,42 +101,41 @@ Roo.extend(Roo.bootstrap.NavProgressBar, Roo.bootstrap.Component,  {
         var item = new Roo.bootstrap.NavProgressItem(cfg);
         
         item.parentId = this.id;
-        item.render(this.el.select('.roo-navigation-bar-list', true).first(), null);
+        item.render(this.el.select('.roo-navigation-bar', true).first(), null);
         
         if(cfg.html){
             var top = new Roo.bootstrap.Element({
                 tag : 'div',
-                cls : 'roo-navigation-bar-text',
-                html : cfg.html
+                cls : 'roo-navigation-bar-text'
             });
             
             var bottom = new Roo.bootstrap.Element({
                 tag : 'div',
-                cls : 'roo-navigation-bar-text',
-                html : cfg.html
+                cls : 'roo-navigation-bar-text'
             });
             
-            top.onRender(this.el.select('.roo-navigation-bar-top', true).first(), null);
-            bottom.onRender(this.el.select('.roo-navigation-bar-bottom', true).first(), null);
+            top.onRender(this.el.select('.roo-navigation-top-bar', true).first(), null);
+            bottom.onRender(this.el.select('.roo-navigation-bottom-bar', true).first(), null);
             
-            top.el.setVisibilityMode(Roo.Element.DISPLAY).hide();
-            bottom.el.setVisibilityMode(Roo.Element.DISPLAY).show();
-            
-            if(typeof(cfg.position) != 'undefined' && cfg.position == 'top'){
-                top.el.show();
-                bottom.el.hide();
-            }
-            
-            item.topEl = 
+            var topText = new Roo.bootstrap.Element({
+                tag : 'span',
+                html : (typeof(cfg.position) != 'undefined' && cfg.position == 'top') ? cfg.html : ''
+            });
             
+            var bottomText = new Roo.bootstrap.Element({
+                tag : 'span',
+                html : (typeof(cfg.position) != 'undefined' && cfg.position == 'top') ? '' : cfg.html
+            });
             
+            topText.onRender(top.el, null);
+            bottomText.onRender(bottom.el, null);
             
+            item.topEl = top;
+            item.bottomEl = bottom;
         }
         
         this.barItems.push(item);
         
-        this.formatBullets();
-        
         return item;
     },
     
@@ -231,25 +232,19 @@ Roo.extend(Roo.bootstrap.NavProgressBar, Roo.bootstrap.Component,  {
         this.setActiveItem(this.barItems[i-1]);
     },
     
-    formatBullets : function()
+    format : function()
     {
         if(!this.barItems.length){
             return;
         }
-        
+     
         var width = 100 / this.barItems.length;
         
-        Roo.each(this.topEl.select('.roo-navigation-bar-text', true).elements, function(el){
-            el.setStyle('width', width + '%');
-        });
-        
-        Roo.each(this.bottomEl.select('.roo-navigation-bar-text', true).elements, function(el){
-            el.setStyle('width', width + '%');
-        });
-        
-        Roo.each(this.iconEl.select('.roo-navigation-bar-item', true).elements, function(el){
-            el.setStyle('width', width + '%');
-        });
+        Roo.each(this.barItems, function(i){
+            i.el.setStyle('width', width + '%');
+            i.topEl.el.setStyle('width', width + '%');
+            i.bottomEl.el.setStyle('width', width + '%');
+        }, this);
         
     }