You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/04/06 07:53:16 UTC

svn commit: r1790359 - in /myfaces/tobago/trunk: ./ tobago-core/src/main/java/org/apache/myfaces/tobago/component/ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ tobago-core/src/main/java/org/apache/myfaces/tobago/inte...

Author: lofwyr
Date: Thu Apr  6 07:53:16 2017
New Revision: 1790359

URL: http://svn.apache.org/viewvc?rev=1790359&view=rev
Log:
Merged from TOBAGO-1719
TOBAGO-1719: Update Bootstrap to 4.0.0 alpha 6 (from alpha 5)
* first fixes for tc:bar and tc:links
* CSS class changes [from revision 1787332]
TOBAGO-1721 Optimize HTML output when two renderer are involved
* rule seems to be no longer needed
[developed by hnoeth] [from revision 1789521]
TOBAGO-1719 Update Bootstrap to 4.0.0 alpha 6 (from alpha 5)
* bootstrap v4-alpha6 progressbar implemented [from revision 1790106]
TOBAGO-1719 Update Bootstrap to 4.0.0 alpha 6 (from alpha 5)
* <tc:box> is more bootstrap-like
* workaround for popup: https://github.com/twbs/bootstrap/issues/21607
* remove CSS class 'navbar' from <tc:header>
* fix checkstyle error on BootstrapClassUnitTest [from revision 1790153]
TOBAGO-1721 Optimize HTML output when two renderer are involved
* optimized HTML output for <tc:bar><tc:links>
* <tc:form inline="true"> render the much more defensive class 'd-line' instead of 'form-inline' [from revision 1790243]
TOBAGO-1721 Optimize HTML output when two renderer are involved
* optimized HTML output for <tc:in> [from revision 1790255]

Added:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java
      - copied, changed from r1790243, myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java
Modified:
    myfaces/tobago/trunk/   (props changed)
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/Arias.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRoleValues.java
    myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss   (contents, props changed)
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/progress.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
    myfaces/tobago/trunk/tobago-theme/pom.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-layout.js
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java

Propchange: myfaces/tobago/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr  6 07:53:16 2017
@@ -1,3 +1,4 @@
+/myfaces/tobago/branches/TOBAGO-1719:1787332,1789521,1790106,1790153,1790243,1790255
 /myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
 /myfaces/tobago/branches/tobago-3.0.x:1781306,1781310,1781380
 /myfaces/tobago/branches/tobago-tree-table:1226794-1341423

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java Thu Apr  6 07:53:16 2017
@@ -49,6 +49,7 @@ public enum RendererTypes {
   LinkAlternativeCommand,
   LinkAlternativeLinks,
   Links,
+  LinksAlternativeBar,
   Label,
   Messages,
   Object,
@@ -119,6 +120,7 @@ public enum RendererTypes {
   public static final String LINK_ALTERNATIVE_COMMAND = "LinkAlternativeCommand";
   public static final String LINK_ALTERNATIVE_LINKS = "LinkAlternativeLinks";
   public static final String LINKS = "Links";
+  public static final String LINKS_ALTERNATIVE_BAR = "LinksAlternativeBar";
   public static final String LABEL = "Label";
   public static final String MESSAGES = "Messages";
   public static final String OBJECT = "Object";

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java Thu Apr  6 07:53:16 2017
@@ -20,8 +20,13 @@
 package org.apache.myfaces.tobago.internal.renderkit.renderer;
 
 import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.RendererTypes;
 import org.apache.myfaces.tobago.component.UIBar;
-import org.apache.myfaces.tobago.internal.component.AbstractUIFormBase;
+import org.apache.myfaces.tobago.internal.component.AbstractUIForm;
+import org.apache.myfaces.tobago.internal.component.AbstractUILinks;
+import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.internal.util.JQueryUtils;
+import org.apache.myfaces.tobago.internal.util.RenderUtils;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.Icons;
@@ -31,17 +36,12 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.html.HtmlButtonTypes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
-import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.JQueryUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class BarRenderer extends RendererBase {
 
@@ -54,20 +54,20 @@ public class BarRenderer extends Rendere
     final String clientId = bar.getClientId(facesContext);
     final String navbarId = clientId + "::navbar";
 
-    writer.startElement(HtmlElements.DIV);
+    writer.startElement(HtmlElements.NAV);
     writer.writeIdAttribute(clientId);
+    writer.writeClassAttribute(BootstrapClass.NAVBAR, BootstrapClass.NAVBAR_TOGGLEABLE);
     writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.NAVIGATION.toString(), false);
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, bar);
 
-    writer.startElement(HtmlElements.DIV);
-    writer.writeClassAttribute(BootstrapClass.CONTAINER_FLUID);
-
     encodeOpener(facesContext, bar, writer, navbarId);
 
     writer.startElement(HtmlElements.DIV);
     writer.writeIdAttribute(navbarId);
-    writer.writeClassAttribute(BootstrapClass.COLLAPSE, BootstrapClass.NAVBAR_TOGGLEABLE_XS);
-// XXX writer.writeClassAttribute(BootstrapClass.COLLAPSE, BootstrapClass.NAVBAR_COLLAPSE, BootstrapClass.NAVBAR_TEXT);
+    writer.writeClassAttribute(
+        BootstrapClass.COLLAPSE,
+        BootstrapClass.NAVBAR_COLLAPSE,
+        BootstrapClass.ALIGN_ITEMS_CENTER);
   }
 
   @Override
@@ -77,26 +77,21 @@ public class BarRenderer extends Rendere
 
   @Override
   public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
-
-    final TobagoResponseWriter writer = getResponseWriter(facesContext);
-
-    List<UIComponent> itemsToEncode = new ArrayList<UIComponent>();
-    collectItemsToEncode(component, itemsToEncode);
-    for (UIComponent child : itemsToEncode) {
-      writer.startElement(HtmlElements.DIV);
-      writer.writeClassAttribute(BootstrapClass.FORM_INLINE);
-      child.encodeAll(facesContext);
-      writer.endElement(HtmlElements.DIV);
+    setRenderTypes(component);
+    for (UIComponent child : component.getChildren()) {
+      if (child.isRendered()) {
+        child.encodeAll(facesContext);
+      }
     }
   }
 
-  private void collectItemsToEncode(final UIComponent component, List<UIComponent> result) {
+  private void setRenderTypes(UIComponent component) throws IOException {
     for (UIComponent child : component.getChildren()) {
       if (child.isRendered()) {
-        if (child instanceof AbstractUIFormBase) {
-          collectItemsToEncode(child, result);
-        } else {
-          result.add(child);
+        if (child instanceof AbstractUIForm) {
+          setRenderTypes(child);
+        } else if (child instanceof AbstractUILinks) {
+          child.setRendererType(RendererTypes.LINKS_ALTERNATIVE_BAR);
         }
       }
     }
@@ -104,20 +99,29 @@ public class BarRenderer extends Rendere
 
   @Override
   public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+    final UIBar bar = (UIBar) component;
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
+    final UIComponent after = ComponentUtils.getFacet(bar, Facets.after);
+
+    if (after != null) {
+      writer.startElement(HtmlElements.DIV);
+      writer.writeClassAttribute(BootstrapClass.MY_LG_0, BootstrapClass.ML_AUTO);
+
+      setRenderTypes(after);
+      RenderUtils.encode(facesContext, after);
+
+      writer.endElement(HtmlElements.DIV);
+    }
     writer.endElement(HtmlElements.DIV);
-    writer.endElement(HtmlElements.DIV);
-    writer.endElement(HtmlElements.DIV);
+    writer.endElement(HtmlElements.NAV);
   }
 
   private void encodeOpener(
       FacesContext facesContext, UIBar bar, TobagoResponseWriter writer, String navbarId) throws IOException {
 
-    writer.startElement(HtmlElements.DIV);
-
     writer.startElement(HtmlElements.BUTTON);
     writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
-    writer.writeClassAttribute(BootstrapClass.NAVBAR_TOGGLER, BootstrapClass.HIDDEN_SM_UP);
+    writer.writeClassAttribute(BootstrapClass.NAVBAR_TOGGLER, BootstrapClass.NAVBAR_TOGGLER_RIGHT);
     writer.writeAttribute(DataAttributes.TOGGLE, "collapse", false);
     writer.writeAttribute(DataAttributes.TARGET, JQueryUtils.escapeIdForHtml(navbarId), true);
     writer.writeAttribute(Arias.EXPANDED, Boolean.FALSE.toString(), false);
@@ -139,7 +143,5 @@ public class BarRenderer extends Rendere
       RenderUtils.encode(facesContext, brand);
       writer.endElement(HtmlElements.SPAN);
     }
-
-    writer.endElement(HtmlElements.DIV);
   }
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java Thu Apr  6 07:53:16 2017
@@ -69,9 +69,7 @@ public class BoxRenderer extends PanelRe
 
     if (label != null || labelString != null || bar != null) {
       writer.startElement(HtmlElements.DIV);
-      writer.writeClassAttribute(BootstrapClass.CARD_HEADER);
-      writer.startElement(HtmlElements.DIV);
-      writer.writeClassAttribute(TobagoClass.BOX__HEADER);
+      writer.writeClassAttribute(BootstrapClass.CARD_HEADER, TobagoClass.BOX__HEADER);
 
       writer.startElement(HtmlElements.H3);
       if (labelString != null) {
@@ -81,13 +79,11 @@ public class BoxRenderer extends PanelRe
         RenderUtils.encode(facesContext, label);
       }
       writer.endElement(HtmlElements.H3);
-
       if (bar != null) {
         RenderUtils.encode(facesContext, bar);
       }
 
       writer.endElement(HtmlElements.DIV);
-      writer.endElement(HtmlElements.DIV);
     }
 
     writer.startElement(HtmlElements.DIV);
@@ -100,5 +96,4 @@ public class BoxRenderer extends PanelRe
     writer.endElement(HtmlElements.DIV);
     writer.endElement(HtmlElements.DIV);
   }
-
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java Thu Apr  6 07:53:16 2017
@@ -42,7 +42,7 @@ public class FooterRenderer extends Rend
     writer.writeIdAttribute(component.getClientId(facesContext));
     writer.writeClassAttribute(
         Classes.create(footer),
-        footer.isFixed() ? BootstrapClass.NAVBAR_FIXED_BOTTOM : null,
+        footer.isFixed() ? BootstrapClass.FIXED_BOTTOM : null,
         footer.getCustomClass());
     writer.writeAttribute(HtmlAttributes.TITLE, footer.getTip(), true);
     writer.writeStyleAttribute(footer.getStyle());

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java Thu Apr  6 07:53:16 2017
@@ -43,7 +43,7 @@ public class FormRenderer extends Render
     writer.writeIdAttribute(clientId);
     writer.writeClassAttribute(
         TobagoClass.FORM,
-        inline ? BootstrapClass.FORM_INLINE : null);
+        inline ? BootstrapClass.D_INLINE : null);
   }
 
   @Override

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java Thu Apr  6 07:53:16 2017
@@ -44,8 +44,7 @@ public class HeaderRenderer extends Rend
     // TBD: how to configure it when it is needed, with customClass, or with markup?
     writer.writeClassAttribute(
         Classes.create(header),
-        BootstrapClass.NAVBAR, /*BootstrapClass.NAVBAR_DARK, BootstrapClass.BG_INVERSE,*/
-        header.isFixed() ? BootstrapClass.NAVBAR_FIXED_TOP : null,
+        header.isFixed() ? BootstrapClass.FIXED_TOP : null,
         header.getCustomClass());
 // TBD: should NAVBAR class be in the LinksRenderer?
     writer.writeAttribute(HtmlAttributes.TITLE, header.getTip(), true);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java Thu Apr  6 07:53:16 2017
@@ -21,8 +21,10 @@ package org.apache.myfaces.tobago.intern
 
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.RendererTypes;
 import org.apache.myfaces.tobago.internal.component.AbstractUIButton;
 import org.apache.myfaces.tobago.internal.component.AbstractUIInput;
+import org.apache.myfaces.tobago.internal.component.AbstractUISelectOneChoice;
 import org.apache.myfaces.tobago.internal.util.AccessKeyLogger;
 import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
 import org.apache.myfaces.tobago.internal.util.JsonUtils;
@@ -30,6 +32,7 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.util.StringUtils;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
+import org.apache.myfaces.tobago.renderkit.css.CssItem;
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -154,12 +157,26 @@ public class InRenderer extends MessageL
         children = Collections.singletonList(addon);
       }
       for (UIComponent child : children) {
-        writer.startElement(HtmlElements.SPAN);
-        final BootstrapClass css
-            = child instanceof AbstractUIButton ? BootstrapClass.INPUT_GROUP_BTN : BootstrapClass.INPUT_GROUP_ADDON;
-        writer.writeClassAttribute(css);
-        RenderUtils.encode(facesContext, child);
-        writer.endElement(HtmlElements.SPAN);
+        if (child instanceof AbstractUIButton && ((AbstractUIButton) child).isParentOfCommands()) {
+          child.setRendererType(RendererTypes.BUTTON_ALTERNATIVE_IN);
+          RenderUtils.encode(facesContext, child);
+        } else {
+          writer.startElement(HtmlElements.SPAN);
+
+          final CssItem cssItem;
+          if (child instanceof AbstractUIButton) {
+            cssItem = BootstrapClass.INPUT_GROUP_BTN;
+          } else if (child instanceof AbstractUISelectOneChoice) {
+            cssItem = BootstrapClass.INPUT_GROUP_BTN;
+            child.setRendererType(RendererTypes.SELECT_ONE_CHOICE_ALTERNATIVE_IN);
+          } else {
+            cssItem = BootstrapClass.INPUT_GROUP_ADDON;
+          }
+
+          writer.writeClassAttribute(cssItem);
+          RenderUtils.encode(facesContext, child);
+          writer.endElement(HtmlElements.SPAN);
+        }
       }
     }
   }
@@ -173,27 +190,3 @@ public class InRenderer extends MessageL
       throws IOException {
   }
 }
-/*
-for (UIComponent child : children) {
-    if (child instanceof AbstractUIButton && ((AbstractUIButton) child).isParentOfCommands()) {
-    child.setRendererType(RendererTypes.BUTTON_ALTERNATIVE_IN);
-    RenderUtils.encode(facesContext, child);
-    } else {
-    writer.startElement(HtmlElements.SPAN);
-
-final CssItem cssItem;
-    if (child instanceof AbstractUIButton) {
-    cssItem = BootstrapClass.INPUT_GROUP_BTN;
-    } else if (child instanceof AbstractUISelectOneChoice) {
-    cssItem = BootstrapClass.INPUT_GROUP_BTN;
-    child.setRendererType(RendererTypes.SELECT_ONE_CHOICE_ALTERNATIVE_IN);
-    } else {
-    cssItem = BootstrapClass.INPUT_GROUP_ADDON;
-    }
-
-    writer.writeClassAttribute(cssItem);
-    RenderUtils.encode(facesContext, child);
-    writer.endElement(HtmlElements.SPAN);
-    }
-    }
-*/

Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java (from r1790243, myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java&p1=myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java&r1=1790243&r2=1790359&rev=1790359&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksAlternativeBarRenderer.java Thu Apr  6 07:53:16 2017
@@ -22,15 +22,10 @@ package org.apache.myfaces.tobago.intern
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.CssItem;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import java.util.List;
-
 public class LinksAlternativeBarRenderer extends LinksRenderer {
 
   @Override
-  protected void addCssItems(final FacesContext facesContext, final UIComponent component,
-                             final List<CssItem> collected) {
-    collected.add(BootstrapClass.NAVBAR_NAV);
+  protected CssItem getExtraCssItem() {
+    return BootstrapClass.NAVBAR_NAV;
   }
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java Thu Apr  6 07:53:16 2017
@@ -23,6 +23,8 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.internal.component.AbstractUILink;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
+import org.apache.myfaces.tobago.renderkit.css.Classes;
+import org.apache.myfaces.tobago.renderkit.css.CssItem;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
@@ -37,7 +39,7 @@ public class LinksRenderer extends Rende
 
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
     writer.startElement(HtmlElements.UL);
-    writer.writeClassAttribute(BootstrapClass.NAV, BootstrapClass.NAVBAR_NAV);
+    writer.writeClassAttribute(Classes.create(component), getExtraCssItem());
     writer.writeIdAttribute(component.getClientId(facesContext));
   }
 
@@ -70,4 +72,8 @@ public class LinksRenderer extends Rende
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
     writer.endElement(HtmlElements.UL);
   }
+
+  protected CssItem getExtraCssItem() {
+    return BootstrapClass.NAV;
+  }
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java Thu Apr  6 07:53:16 2017
@@ -52,7 +52,9 @@ public class PopupRenderer extends Panel
     writer.writeClassAttribute(
         Classes.create(popup),
         BootstrapClass.MODAL,
-        BootstrapClass.FADE,
+        //XXX fade class removed due to a bug in bootstrap-alpha6
+        //https://github.com/twbs/bootstrap/issues/21607
+        //BootstrapClass.FADE,
         popup.getCustomClass());
     writer.writeIdAttribute(clientId);
     writer.writeAttribute(HtmlAttributes.TABINDEX, -1);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java Thu Apr  6 07:53:16 2017
@@ -19,15 +19,19 @@
 
 package org.apache.myfaces.tobago.internal.renderkit.renderer;
 
-import org.apache.myfaces.tobago.component.UIProgress;
+import org.apache.myfaces.tobago.internal.component.AbstractUIProgress;
+import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.internal.util.JsonUtils;
+import org.apache.myfaces.tobago.internal.util.RenderUtils;
+import org.apache.myfaces.tobago.layout.Measure;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
+import org.apache.myfaces.tobago.renderkit.css.Style;
+import org.apache.myfaces.tobago.renderkit.html.Arias;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
-import org.apache.myfaces.tobago.internal.util.JsonUtils;
-import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
+import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,31 +46,30 @@ public class ProgressRenderer extends Re
 
   @Override
   public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
-
-    final UIProgress progress = (UIProgress) component;
+    final AbstractUIProgress progress = (AbstractUIProgress) component;
 
     final double value = progress.getRangeValue();
     final double max = progress.getRangeMax();
-    final double percent = value >= max ? 1 : (value / max);
-
-    String title = progress.getTip();
-    if (title == null) {
-      title = (int) (percent * 100) + " %";
-    }
-
-    final int newValue = percent == 0 ? 0 : 100;
-    final double newMax = percent == 0 ? 100 : 1 / percent * 100;
+    final double percent = value / max;
 
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
 
-    writer.startElement(HtmlElements.PROGRESS);
+    writer.startElement(HtmlElements.DIV);
     writer.writeIdAttribute(progress.getClientId(facesContext));
     writer.writeClassAttribute(Classes.create(progress), progress.getCustomClass(), BootstrapClass.PROGRESS);
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, progress);
     writer.writeStyleAttribute(progress.getStyle());
-    writer.writeAttribute(HtmlAttributes.TITLE, title, true);
-    writer.writeAttribute(HtmlAttributes.MAX, Double.toString(newMax), false);
-    writer.writeAttribute(HtmlAttributes.VALUE, newValue);
+
+    writer.startElement(HtmlElements.DIV);
+    writer.writeClassAttribute(BootstrapClass.PROGRESS_BAR);
+    writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.PROGRESSBAR.toString(), false);
+    writer.writeAttribute(Arias.VALUEMIN, 0);
+    writer.writeAttribute(Arias.VALUEMAX, 100);
+    writer.writeAttribute(Arias.VALUENOW, String.valueOf((int) percent * 100), false);
+
+    Style style = new Style();
+    style.setWidth(new Measure(percent * 100, Measure.Unit.PERCENT));
+    writer.writeStyleAttribute(style);
 
     writer.writeCommandMapAttribute(JsonUtils.encode(RenderUtils.getBehaviorCommands(facesContext, progress)));
   }
@@ -75,6 +78,7 @@ public class ProgressRenderer extends Re
   public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
 
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
-    writer.endElement(HtmlElements.PROGRESS);
+    writer.endElement(HtmlElements.DIV);
+    writer.endElement(HtmlElements.DIV);
   }
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java Thu Apr  6 07:53:16 2017
@@ -37,6 +37,6 @@ import javax.faces.component.UIPanel;
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUILinks",
     uiComponentFacesClass = "javax.faces.component.UIPanel",
     componentFamily = UIPanel.COMPONENT_FAMILY,
-    rendererType = RendererTypes.LINKS)
+    rendererType = {RendererTypes.LINKS, RendererTypes.LINKS_ALTERNATIVE_BAR})
 public interface LinksTagDeclaration extends HasIdBindingAndRendered, IsVisual, HasTip {
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java Thu Apr  6 07:53:16 2017
@@ -42,6 +42,7 @@ public enum BootstrapClass implements Cs
   ALERT_WARNING("alert-warning"),
   ALERT_INFO("alert-info"),
   ALERT_DISMISSIBLE("alert-dismissible"),
+  ALIGN_ITEMS_CENTER("align-items-center"),
   BG_INVERSE("bg-inverse"),
   BTN("btn"),
   BTN_DANGER("btn-danger"),
@@ -95,18 +96,54 @@ public enum BootstrapClass implements Cs
   COL_SM_10("col-sm-10"),
   COL_SM_11("col-sm-11"),
   COL_SM_12("col-sm-12"),
-  COL_XS_1("col-xs-1"),
-  COL_XS_2("col-xs-2"),
-  COL_XS_3("col-xs-3"),
-  COL_XS_4("col-xs-4"),
-  COL_XS_5("col-xs-5"),
-  COL_XS_6("col-xs-6"),
-  COL_XS_7("col-xs-7"),
-  COL_XS_8("col-xs-8"),
-  COL_XS_9("col-xs-9"),
-  COL_XS_10("col-xs-10"),
-  COL_XS_11("col-xs-11"),
-  COL_XS_12("col-xs-12"),
+  COL_1("col-1"),
+  COL_2("col-2"),
+  COL_3("col-3"),
+  COL_4("col-4"),
+  COL_5("col-5"),
+  COL_6("col-6"),
+  COL_7("col-7"),
+  COL_8("col-8"),
+  COL_9("col-9"),
+  COL_10("col-10"),
+  COL_11("col-11"),
+  COL_12("col-12"),
+  /** @deprecated since 3.1.0, please use {@link #COL_1} */
+  @Deprecated
+  COL_XS_1("col-1"),
+  /** @deprecated since 3.1.0, please use {@link #COL_2} */
+  @Deprecated
+  COL_XS_2("col-2"),
+  /** @deprecated since 3.1.0, please use {@link #COL_3} */
+  @Deprecated
+  COL_XS_3("col-3"),
+  /** @deprecated since 3.1.0, please use {@link #COL_4} */
+  @Deprecated
+  COL_XS_4("col-4"),
+  /** @deprecated since 3.1.0, please use {@link #COL_5} */
+  @Deprecated
+  COL_XS_5("col-5"),
+  /** @deprecated since 3.1.0, please use {@link #COL_6} */
+  @Deprecated
+  COL_XS_6("col-6"),
+  /** @deprecated since 3.1.0, please use {@link #COL_7} */
+  @Deprecated
+  COL_XS_7("col-7"),
+  /** @deprecated since 3.1.0, please use {@link #COL_8} */
+  @Deprecated
+  COL_XS_8("col-8"),
+  /** @deprecated since 3.1.0, please use {@link #COL_9} */
+  @Deprecated
+  COL_XS_9("col-9"),
+  /** @deprecated since 3.1.0, please use {@link #COL_10} */
+  @Deprecated
+  COL_XS_10("col-10"),
+  /** @deprecated since 3.1.0, please use {@link #COL_11} */
+  @Deprecated
+  COL_XS_11("col-11"),
+  /** @deprecated since 3.1.0, please use {@link #COL_12} */
+  @Deprecated
+  COL_XS_12("col-12"),
   CONTAINER("container"),
   CONTAINER_FLUID("container-fluid"),
   D_INLINE("d-inline"),
@@ -119,6 +156,8 @@ public enum BootstrapClass implements Cs
   FIGURE("figure"),
   FIGURE_CAPTION("figure-caption"),
   FIGURE_IMG("figure-img"),
+  FIXED_BOTTOM("fixed-bottom"),
+  FIXED_TOP("fixed-top"),
   FORM_CHECK("form-check"),
   FORM_CHECK_INLINE("form-check-inline"),
   FORM_CHECK_INPUT("form-check-input"),
@@ -135,23 +174,45 @@ public enum BootstrapClass implements Cs
   INPUT_GROUP_ADDON("input-group-addon"),
   INPUT_GROUP_BTN("input-group-btn"),
   INVISIBLE("invisible"),
+  ML_AUTO("ml-auto"),
   MODAL("modal"),
   MODAL_CONTENT("modal-content"),
   MODAL_DIALOG("modal-dialog"),
   MODAL_LG("modal-lg"),
   MODAL_SM("modal-sm"),
+  MR_AUTO("mr-auto"),
+  MY_LG_0("my-lg-0"),
+  MY_LG_1("my-lg-1"),
+  MY_LG_2("my-lg-2"),
+  MY_LG_3("my-lg-3"),
+  MY_LG_4("my-lg-4"),
+  MY_LG_5("my-lg-5"),
   NAV("nav"),
   NAV_ITEM("nav-item"),
   NAV_LINK("nav-link"),
   NAV_TABS("nav-tabs"),
   NAVBAR("navbar"),
+  NAVBAR_COLLAPSE("navbar-collapse"),
   NAVBAR_BRAND("navbar-brand"),
-  NAVBAR_DARK("navbar-dark"),
-  NAVBAR_FIXED_BOTTOM("navbar-fixed-bottom"),
-  NAVBAR_FIXED_TOP("navbar-fixed-top"),
+  /** @deprecated since 3.1.0, please use {@link #NAVBAR_INVERSE} */
+  @Deprecated
+  NAVBAR_DARK("navbar-inverse"),
+  /** @deprecated since 3.1.0, please use {@link #FIXED_BOTTOM} */
+  @Deprecated
+  NAVBAR_FIXED_BOTTOM("fixed-bottom"),
+  /** @deprecated since 3.1.0, please use {@link #FIXED_TOP} */
+  @Deprecated
+  NAVBAR_FIXED_TOP("fixed-top"),
+  NAVBAR_INVERSE("navbar-inverse"),
   NAVBAR_NAV("navbar-nav"),
-  NAVBAR_TOGGLEABLE_XS("navbar-toggleable-xs"),
+  NAVBAR_TOGGLEABLE("navbar-toggleable"),
+  /** @deprecated since 3.1.0, please use {@link #NAVBAR_TOGGLEABLE} */
+  @Deprecated
+  NAVBAR_TOGGLEABLE_XS("navbar-toggleable"),
   NAVBAR_TOGGLER("navbar-toggler"),
+  NAVBAR_TOGGLER_ICON("navbar-toggler-icon"),
+  NAVBAR_TOGGLER_LEFT("navbar-toggler-left"),
+  NAVBAR_TOGGLER_RIGHT("navbar-toggler-right"),
   OFFSET_LG_0("offset-lg-0"),
   OFFSET_LG_1("offset-lg-1"),
   OFFSET_LG_2("offset-lg-2"),
@@ -188,22 +249,23 @@ public enum BootstrapClass implements Cs
   OFFSET_SM_9("offset-sm-9"),
   OFFSET_SM_10("offset-sm-10"),
   OFFSET_SM_11("offset-sm-11"),
-  OFFSET_XS_1("offset-xs-1"),
-  OFFSET_XS_2("offset-xs-2"),
-  OFFSET_XS_3("offset-xs-3"),
-  OFFSET_XS_4("offset-xs-4"),
-  OFFSET_XS_5("offset-xs-5"),
-  OFFSET_XS_6("offset-xs-6"),
-  OFFSET_XS_7("offset-xs-7"),
-  OFFSET_XS_8("offset-xs-8"),
-  OFFSET_XS_9("offset-xs-9"),
-  OFFSET_XS_10("offset-xs-10"),
-  OFFSET_XS_11("offset-xs-11"),
+  OFFSET_1("offset-1"),
+  OFFSET_2("offset-2"),
+  OFFSET_3("offset-3"),
+  OFFSET_4("offset-4"),
+  OFFSET_5("offset-5"),
+  OFFSET_6("offset-6"),
+  OFFSET_7("offset-7"),
+  OFFSET_8("offset-8"),
+  OFFSET_9("offset-9"),
+  OFFSET_10("offset-10"),
+  OFFSET_11("offset-11"),
   OPEN("open"),
   PAGE_ITEM("page-item"),
   PAGE_LINK("page-link"),
   PAGINATION("pagination"),
   PROGRESS("progress"),
+  PROGRESS_BAR("progress-bar"),
   ROW("row"),
   SR_ONLY("sr-only"),
   TAB_CONTENT("tab-content"),
@@ -268,9 +330,9 @@ public enum BootstrapClass implements Cs
   public static class Generator {
 
     private static final BootstrapClass[] EXTRA_SMALL = new BootstrapClass[]{
-        COL_XS_1, COL_XS_2, COL_XS_3, COL_XS_4,
-        COL_XS_5, COL_XS_6, COL_XS_7, COL_XS_8,
-        COL_XS_9, COL_XS_10, COL_XS_11, COL_XS_12,
+        COL_1, COL_2, COL_3, COL_4,
+        COL_5, COL_6, COL_7, COL_8,
+        COL_9, COL_10, COL_11, COL_12,
     };
     private static final BootstrapClass[] SMALL = new BootstrapClass[]{
         COL_SM_1, COL_SM_2, COL_SM_3, COL_SM_4,
@@ -288,8 +350,8 @@ public enum BootstrapClass implements Cs
         COL_LG_9, COL_LG_10, COL_LG_11, COL_LG_12,
     };
     private static final BootstrapClass[] OFFSET_EXTRA_SMALL = new BootstrapClass[]{
-        null, OFFSET_XS_1, OFFSET_XS_2, OFFSET_XS_3, OFFSET_XS_4, OFFSET_XS_5,
-        OFFSET_XS_6, OFFSET_XS_7, OFFSET_XS_8, OFFSET_XS_9, OFFSET_XS_10, OFFSET_XS_11
+        null, OFFSET_1, OFFSET_2, OFFSET_3, OFFSET_4, OFFSET_5,
+        OFFSET_6, OFFSET_7, OFFSET_8, OFFSET_9, OFFSET_10, OFFSET_11
     };
     private static final BootstrapClass[] OFFSET_SMALL = new BootstrapClass[]{
         OFFSET_SM_0, OFFSET_SM_1, OFFSET_SM_2, OFFSET_SM_3, OFFSET_SM_4, OFFSET_SM_5,

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/Arias.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/Arias.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/Arias.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/Arias.java Thu Apr  6 07:53:16 2017
@@ -42,7 +42,10 @@ public enum Arias implements MarkupLangu
   PRESSED("aria-pressed"),
   RELEVANT("aria-relevant"),
   SETSIZE("aria-setsize"),
-  SORT("aria-sort");
+  SORT("aria-sort"),
+  VALUEMAX("aria-valuemax"),
+  VALUEMIN("aria-valuemin"),
+  VALUENOW("aria-valuenow");
 
   private final String value;
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRoleValues.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRoleValues.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRoleValues.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRoleValues.java Thu Apr  6 07:53:16 2017
@@ -28,6 +28,7 @@ public enum HtmlRoleValues {
   MENU("menu"),
   NAVIGATION("navigation"),
   PRESENTATION("presentation"),
+  PROGRESSBAR("progressbar"),
   TAB("tab"),
   TABLIST("tablist"),
   TABPANEL("tabpanel");

Modified: myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss Thu Apr  6 07:53:16 2017
@@ -25,16 +25,17 @@ $zindex-popover: 1060 !default;
 $spacer: 1rem !default;
 $spacer-x: $spacer !default;
 $spacer-y: $spacer !default;
+$card-spacer-y: .75rem !default;
+$brand-primary: #0275d8 !default;
+$link-color: $brand-primary !default;
+$link-hover-color: darken($link-color, 15%) !default;
+$nav-link-padding: .5em 1em !default;
 
 /* fix bootstrap ---------------------------------------------------- */
 span.dropdown {
   display: inline-flex;
 }
 
-.form-check-label.dropdown-item {
-  padding-left: 1.25rem;
-}
-
 /*
 Todo: check, if this is needed? (It doesn't work with the build system)
 
@@ -57,12 +58,28 @@ Todo: check, if this is needed? (It does
 
 /* box -------------------------------------------------------------- */
 
+.tobago-box {
+  margin-bottom: $card-spacer-y;
+}
+
 .tobago-box-header {
   display: flex;
   justify-content: space-between;
   align-content: center;
 }
 
+.card-header {
+
+  > h3:first-child {
+    margin-bottom: 0;
+    align-self: center;
+  }
+
+  .navbar {
+    padding: 0;
+  }
+}
+
 /* button -------------------------------------------------------------- */
 
 /* XXX fixes a problem with image in button inside a segmentLayout (with FF40 and IE11)
@@ -222,7 +239,7 @@ body {
   box-shadow: 0 0 5px 5px rgba(200,200,200,0.5);
 }
 
-.navbar-fixed-bottom {
+.fixed-bottom {
   margin-top: 10px;
 }
 
@@ -271,7 +288,7 @@ table.tobago-gridLayout > tbody > tr > t
     margin-bottom: 1rem;
 }
 
-.tobago-header.navbar-fixed-top {
+.tobago-header.fixed-top {
     margin-bottom: 0;
 }
 
@@ -335,10 +352,15 @@ button.tobago-link-markup-disabled:hover
   text-decoration: none;
 }
 
-.tobago-button, .tobago-link, .tobago-linkAlternativeCommand {
-  > *:nth-child(n+2) {
-    margin-left: .4em;
-  }
+button.nav-link { /* bootstrap don't know button.nav-link*/
+  padding: $nav-link-padding;
+  padding-top: .55em;
+  padding-bottom: .45em;
+}
+
+.navbar-nav button.nav-link {
+  padding-left: 0;
+  padding-right: 0;
 }
 
 /* messages ----------------------------------------------------------- */
@@ -371,11 +393,13 @@ a.tobago-messages-button {
 
 /* nav ----------------------------------------------------------- */
 
+/*
 .nav-item > span > .tobago-link, .nav-item > span > .tobago-command {
   padding-top: .425rem;
   padding-bottom: .425rem;
   display: inline-block;
 }
+*/
 
 /* styles for drop down menu first level */
 .dropdown-toggle:focus, .dropdown-toggle:hover {
@@ -962,15 +986,6 @@ fixes missing space, I thinks normal Web
 
 fixme: there is a problem with the selectManyShuttle with this style.
 */
-.navbar button:nth-child(n+2),
-.navbar input:nth-child(n+2) {
-  margin-left: 5px;
-}
-
-.tobago-button > *:nth-child(n+2),
-.tobago-link > *:nth-child(n+2) {
-  margin-left: .4em;
-}
 
 .tobago-label {
   width: 155px;

Propchange: myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr  6 07:53:16 2017
@@ -1,3 +1,4 @@
+/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss:1787332,1789521,1790153,1790243
 /myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1356585,1357124
 /myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1226794-1341423
 /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,16755
 88-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/progress.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/progress.xhtml?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/progress.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/progress.xhtml Thu Apr  6 07:53:16 2017
@@ -36,7 +36,7 @@
   <tc:section label="Basics">
     <p>A static progressbar, with <code>value</code> of type <code>double</code>.</p>
     <pre><code class="language-markup">&lt;tc:progress value="15.8" max="20"/></code></pre>
-    <tc:progress value="14.9" max="20"/>
+    <tc:progress value="15.8" max="20"/>
   </tc:section>
 
   <tc:section label="Style">

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml Thu Apr  6 07:53:16 2017
@@ -21,16 +21,25 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
   <ui:param name="title" value="#{demoBundle.box} &lt;tc:box>"/>
   <p>A content box is created with <code class="language-markup">&lt;tc:box/></code>.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
            link="#{demoBundle.tagDocUrl}/#{info.stableVersion}/tld/tc/box.html"/>
   <tc:section label="Basics">
-    <p>The title of the box is set by the <code>label</code> attribute.</p>
+    <p>The title of the box is set by the <code>label</code> attribute or with
+      <code class="language-markup">&lt;f:facet name="label"></code>.</p>
     <pre><code class="language-markup">&lt;tc:box label="Box">Content&lt;/tc:box></code></pre>
-    <tc:box id="b1" label="Box">Content</tc:box>
-    <tc:box>Contentbox without a title.</tc:box>
+    <tc:box id="labelAttrBox" label="Box">
+      Title set by <code>label</code> attribute.
+    </tc:box>
+    <tc:box id="labelFacetBox">
+      <f:facet name="label">
+        <h:outputText value="#{outController.html}" escape="false"/>
+      </f:facet>
+      Title set by <code class="language-markup">&lt;f:facet name="label"></code>.
+    </tc:box>
+    <tc:box id="noTitleBox">Contentbox without a title.</tc:box>
   </tc:section>
 
   <tc:section label="Collapse/Expand">
@@ -47,17 +56,16 @@
     <p>It's possible to add a bar to the header of a content box. For that, the content box must contain the tag
       <code class="language-markup">&lt;f:facet name="bar"></code>. The facet may contain
       <code class="language-markup">&lt;tc:bar></code> or other suitable tags.</p>
-    <tc:box>
-      <f:facet name="label">
-        Label
-      </f:facet>
+    <tc:box label="Title">
       <f:facet name="bar">
-        <tc:buttons>
-          <tc:button label="Button 1"/>
-          <tc:button label="Button 2"/>
-        </tc:buttons>
+        <tc:bar>
+          <tc:buttons>
+            <tc:button label="Left"/>
+            <tc:button label="Right"/>
+          </tc:buttons>
+        </tc:bar>
       </f:facet>
-      Content
+      Box with <code class="language-markup">&lt;f:facet name="bar"></code>.
     </tc:box>
   </tc:section>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/bar.xhtml Thu Apr  6 07:53:16 2017
@@ -37,7 +37,8 @@
       Buttons and links don't have any functionality.</p>
     <tc:bar>
       <f:facet name="brand">
-        <tc:link id="brand" label="Tobago Demo" image="#{request.contextPath}/image/feather-leaf.png" link="/"/>
+        <!-- label="Tobago Demo" contains a NO-BREAK SPACE character -->
+        <tc:link id="brand" label="Tobago Demo" image="#{request.contextPath}/image/feather-leaf.png" link="/"/>
       </f:facet>
       <tc:links>
         <tc:link label="Home"/>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/component.xhtml Thu Apr  6 07:53:16 2017
@@ -17,11 +17,28 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/main.xhtml"
+<ui:composition template="/main.xhtml" xmlns:tc="http://myfaces.apache.org/tobago/component" xmlns:f="http://java.sun.com/jsf/core"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
   <ui:param name="title" value="#{demoBundle.component}"/>
   <p>The different components of Tobago are shown in this section.
     There are some classic components like inputfields, outputfields or radiobuttons
     and some more advanced like a popup dialog, a tabgroup or a sheet.</p>
+
+  <tc:in>
+    <f:facet name="after">
+      <tc:button label="Button" omit="true">
+        <tc:selectOneRadio>
+          <tc:selectItem itemValue="Item One"/>
+          <tc:selectItem itemValue="Item Two"/>
+        </tc:selectOneRadio>
+      </tc:button>
+    </f:facet>
+  </tc:in>
+  <tc:in>
+    <f:facet name="after">
+      <tc:button label="Button"/>
+    </f:facet>
+  </tc:in>
+
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Thu Apr  6 07:53:16 2017
@@ -32,10 +32,11 @@
 
     <tc:bar id="bar">
       <f:facet name="brand">
-        <tc:link image="#{request.contextPath}/image/feather-leaf.png" label="Tobago Demo" id="brand" link="/"/>
+        <!-- label="Tobago Demo" contains a NO-BREAK SPACE character -->
+        <tc:link image="#{request.contextPath}/image/feather-leaf.png" label="Tobago Demo" id="brand" link="/"/>
       </f:facet>
 
-      <tc:form id="header" inline="true">
+      <tc:form id="header">
 
         <tc:links id="commands">
 
@@ -107,34 +108,37 @@
         </tc:links>
       </tc:form>
 
-      <tc:flowLayout textAlign="right">
-        <!--<tc:form inline="true">
-          <tc:in placeholder="Search"/>
-          <tc:button defaultCommand="true" omit="true" label="go">
-            <tc:dataAttribute name="alert-text"
-                              value="Sorry: Search not implemented"/>
-
-          </tc:button>
-        </tc:form>-->
-        <tc:form id="navbtns" inline="true">
-          <tc:buttons>
-            <tc:button immediate="true" id="previous"
-                       image="fa-angle-left"
-                       action="#{navigationState.gotoPrevious}"
-                       disabled="#{navigationState.first}"
-                       tip="#{demoBundle.footer_previous}"/>
-            <tc:button immediate="true" id="next"
-                       image="fa-angle-right"
-                       action="#{navigationState.gotoNext}"
-                       disabled="#{navigationState.last}"
-                       tip="#{demoBundle.footer_next}"/>
-          </tc:buttons>
-          <tc:button action="#{navigationState.toggleViewSource}"
-                     image="fa-code"
-                     immediate="true" tip="#{demoBundle.footer_viewSource}"/>
-        </tc:form>
-      </tc:flowLayout>
-
+      <f:facet name="after">
+        <tc:flexLayout columns="auto;auto">
+          <tc:form>
+            <tc:flexLayout columns="200px;auto">
+              <tc:in placeholder="Search" labelLayout="skip"/>
+              <tc:button defaultCommand="true" omit="true" label="go">
+                <tc:dataAttribute name="alert-text" value="Sorry: Search not implemented"/>
+              </tc:button>
+            </tc:flexLayout>
+          </tc:form>
+          <tc:form id="navbtns">
+            <tc:flexLayout columns="auto;auto">
+              <tc:buttons>
+                <tc:button immediate="true" id="previous"
+                           image="fa-angle-left"
+                           action="#{navigationState.gotoPrevious}"
+                           disabled="#{navigationState.first}"
+                           tip="#{demoBundle.footer_previous}"/>
+                <tc:button immediate="true" id="next"
+                           image="fa-angle-right"
+                           action="#{navigationState.gotoNext}"
+                           disabled="#{navigationState.last}"
+                           tip="#{demoBundle.footer_next}"/>
+              </tc:buttons>
+              <tc:button action="#{navigationState.toggleViewSource}"
+                         image="fa-code"
+                         immediate="true" tip="#{demoBundle.footer_viewSource}"/>
+            </tc:flexLayout>
+          </tc:form>
+        </tc:flexLayout>
+      </f:facet>
     </tc:bar>
 
 <!--

Modified: myfaces/tobago/trunk/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/pom.xml?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Thu Apr  6 07:53:16 2017
@@ -27,7 +27,7 @@
   <artifactId>tobago-theme</artifactId>
 
   <properties>
-    <bootstrap.version>4.0.0-alpha.5</bootstrap.version>
+    <bootstrap.version>4.0.0-alpha.6</bootstrap.version>
   </properties>
 
   <build>

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-layout.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-layout.js?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-layout.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-layout.js Thu Apr  6 07:53:16 2017
@@ -247,7 +247,7 @@ Tobago.Layout.init = function (elements)
   // XXX Is there a CSS solution?
   // TODO: this might be reevaluated after a "resize"
 
-  var header = Tobago.Utils.selectWithJQuery(elements, ".navbar-fixed-top");
+  var header = Tobago.Utils.selectWithJQuery(elements, ".fixed-top");
   header.each(function () {
     var content = header.next();
     content.css({
@@ -255,7 +255,7 @@ Tobago.Layout.init = function (elements)
     });
   });
 
-  var footer = Tobago.Utils.selectWithJQuery(elements, ".navbar-fixed-bottom");
+  var footer = Tobago.Utils.selectWithJQuery(elements, ".fixed-bottom");
   footer.each(function () {
     var content = footer.prev();
     content.css({

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java?rev=1790359&r1=1790358&r2=1790359&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassUnitTest.java Thu Apr  6 07:53:16 2017
@@ -19,10 +19,11 @@
 
 package org.apache.myfaces.tobago.renderkit.css;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -30,18 +31,40 @@ import java.util.List;
  */
 public class BootstrapClassUnitTest {
 
+  private List<BootstrapClass> not = Arrays.asList(
+      BootstrapClass.COL_XS_1,
+      BootstrapClass.COL_XS_2,
+      BootstrapClass.COL_XS_3,
+      BootstrapClass.COL_XS_4,
+      BootstrapClass.COL_XS_5,
+      BootstrapClass.COL_XS_6,
+      BootstrapClass.COL_XS_7,
+      BootstrapClass.COL_XS_8,
+      BootstrapClass.COL_XS_9,
+      BootstrapClass.COL_XS_10,
+      BootstrapClass.COL_XS_11,
+      BootstrapClass.COL_XS_12,
+      BootstrapClass.NAVBAR_DARK,
+      BootstrapClass.NAVBAR_TOGGLEABLE_XS
+  );
+
   /**
    * This test checks, if every item of the {@link BootstrapClass} occurs in the bootstrap.css.
    */
   @Test
   public void testCompareBootstrapCss() throws FileNotFoundException {
 
-    final List<CssItem> missing =
+    final BootstrapClass[] allValues = BootstrapClass.values();
+    final List<BootstrapClass> toCheck = new ArrayList<BootstrapClass>();
+    for (BootstrapClass value : allValues) {
+      if (!not.contains(value)) {
+        toCheck.add(value);
+      }
+    }
+
     CssClassUtils.compareCss(
         "src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css",
-        BootstrapClass.values());
-
-    Assert.assertTrue("These classes are missing in bootstrap.css: " + missing, missing.isEmpty());
+        toCheck.toArray(new BootstrapClass[toCheck.size()]));
   }
 
 }