You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2018/01/19 14:38:23 UTC
[myfaces-tobago] 01/02: TOBAGO-1837 Update Bootstrap to 4.0.0 final
(from beta 2) * update to Bootstrap 4.0.0 final * adjust tc:data and
tc:file * adjust rendering of tc:bar toggle-button
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 03ed59d736809999b9e9de07a0796c77a82eb6fe
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Jan 19 15:37:41 2018 +0100
TOBAGO-1837 Update Bootstrap to 4.0.0 final (from beta 2)
* update to Bootstrap 4.0.0 final
* adjust tc:data and tc:file
* adjust rendering of tc:bar toggle-button
---
.../tobago/internal/renderkit/renderer/BarRenderer.java | 12 +++---------
.../tobago/internal/renderkit/renderer/DateRenderer.java | 2 +-
.../tobago/internal/renderkit/renderer/FileRenderer.java | 2 +-
tobago-theme/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
index 011e9c6..47e1c8a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
@@ -26,11 +26,9 @@ import org.apache.myfaces.tobago.context.Markup;
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.JsonUtils;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
-import org.apache.myfaces.tobago.renderkit.css.Icons;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.Arias;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
@@ -167,17 +165,13 @@ public class BarRenderer extends RendererBase {
writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
writer.writeClassAttribute(BootstrapClass.NAVBAR_TOGGLER);
writer.writeAttribute(DataAttributes.TOGGLE, "collapse", false);
- writer.writeAttribute(DataAttributes.TARGET, JQueryUtils.escapeIdForHtml(navbarId), true);
+ writer.writeAttribute(DataAttributes.TARGET, "#" + navbarId, true);
writer.writeAttribute(Arias.EXPANDED, Boolean.FALSE.toString(), false);
writer.writeAttribute(Arias.CONTROLS, navbarId, false);
-
- writer.startElement(HtmlElements.I);
- writer.writeClassAttribute(Icons.FA, Icons.BARS);
- writer.endElement(HtmlElements.I);
+ writer.writeAttribute(Arias.LABEL, "Toggle navigation", false);
writer.startElement(HtmlElements.SPAN);
- writer.writeClassAttribute(BootstrapClass.SR_ONLY);
- writer.writeText("Toggle navigation"); // todo: i18n
+ writer.writeClassAttribute(BootstrapClass.NAVBAR_TOGGLER_ICON);
writer.endElement(HtmlElements.SPAN);
writer.endElement(HtmlElements.BUTTON);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
index 8daea7a..51dc28b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
@@ -89,7 +89,7 @@ public class DateRenderer extends InRenderer {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.SPAN);
- writer.writeClassAttribute(BootstrapClass.INPUT_GROUP_BTN);
+ writer.writeClassAttribute(BootstrapClass.INPUT_GROUP_APPEND);
writer.startElement(HtmlElements.BUTTON);
writer.writeClassAttribute(
BootstrapClass.BTN,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
index 88d96b4..509898e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
@@ -172,7 +172,7 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
writer.endElement(HtmlElements.INPUT);
writer.startElement(HtmlElements.SPAN);
- writer.writeClassAttribute(BootstrapClass.INPUT_GROUP_BTN);
+ writer.writeClassAttribute(BootstrapClass.INPUT_GROUP_APPEND);
writer.startElement(HtmlElements.BUTTON);
writer.writeAttribute(HtmlAttributes.TABINDEX, file.getTabIndex());
writer.writeClassAttribute(BootstrapClass.BTN, BootstrapClass.BTN_SECONDARY);
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index fd6328d..332c0cd 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -27,7 +27,7 @@
<artifactId>tobago-theme</artifactId>
<properties>
- <bootstrap.version>4.0.0-beta.3</bootstrap.version>
+ <bootstrap.version>4.0.0</bootstrap.version>
</properties>
<build>
@@ -110,7 +110,7 @@
<url>https://github.com/twbs/bootstrap/archive/v${bootstrap.version}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>e2da6e208f6eec8294794f1b908255c5</md5>
+ <md5>0cb02a456664efeadd84601f53143530</md5>
</configuration>
</execution>
</executions>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.