X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fbootstrap%2FNavGroup.js;h=15e239e7f7147b943c33df50ca705d4824e61326;hb=294506d9a9f5302102745775107795bdc854e4e7;hp=6cd3ce6b42de8d5168f4d5a4bc5cb181a370f0ec;hpb=055eecf17935accbac343697b384ed6d32d800f0;p=roojs1

diff --git a/Roo/bootstrap/NavGroup.js b/Roo/bootstrap/NavGroup.js
index 6cd3ce6b42..15e239e7f7 100644
--- a/Roo/bootstrap/NavGroup.js
+++ b/Roo/bootstrap/NavGroup.js
@@ -57,15 +57,20 @@ Roo.extend(Roo.bootstrap.NavGroup, Roo.bootstrap.Component,  {
             tag : 'ul',
             cls: 'nav' 
         };
-        
-        if (['tabs','pills'].indexOf(this.type)!==-1) {
-            cfg.cls += ' nav-' + this.type
-        } else {
-            if (this.type!=='nav') {
-                Roo.log('nav type must be nav/tabs/pills')
-            }
-            cfg.cls += ' navbar-nav'
-        }
+        if (Roo.bootstrap.version == 4) {
+	    if (this.type == 'pills') {
+		cfg.cls = ' nav-pills';
+	    }
+	} else {
+	    if (['tabs','pills'].indexOf(this.type)!==-1) {
+		cfg.cls += ' nav-' + this.type
+	    } else {
+		if (this.type !== 'nav') {
+		    Roo.log('nav type must be nav/tabs/pills')
+		}
+		cfg.cls += ' navbar-nav'
+	    }
+	}
         
         if (this.parent() && this.parent().sidebar) {
             cfg = {
@@ -79,7 +84,7 @@ Roo.extend(Roo.bootstrap.NavGroup, Roo.bootstrap.Component,  {
         if (this.form === true) {
             cfg = {
                 tag: 'form',
-                cls: 'navbar-form'
+                cls: 'navbar-form form-inline'
             };
             
             if (this.align === 'right') {
@@ -166,7 +171,10 @@ Roo.extend(Roo.bootstrap.NavGroup, Roo.bootstrap.Component,  {
     */
     addItem : function(cfg)
     {
-        var cn = new Roo.bootstrap.NavItem(cfg);
+        if (this.form && Roo.bootstrap.version == 4) {
+	    cfg.tag = 'div';
+	}
+	var cn = new Roo.bootstrap.NavItem(cfg);
         this.register(cn);
         cn.parentId = this.id;
         cn.onRender(this.el, null);