From 62e20499bc6b93ada618a06c1f8e3ee6cd431d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Rozkovec?= Date: Mon, 4 Dec 2023 11:24:37 +0100 Subject: [PATCH] Replace .sr-only -> .visually-hidden, use static Helper where applicable --- .../markup/html/bootstrap/button/dropdown/SplitButton.html | 2 +- .../core/markup/html/bootstrap/components/progress/Stack.html | 2 +- .../core/markup/html/bootstrap/components/progress/Stack.java | 3 +++ .../html/bootstrap/components/progress/ProgressBarTest.java | 3 ++- .../markup/html/bootstrap/spinner/SpinnerAjaxButton.java | 3 ++- .../markup/html/bootstrap/spinner/SpinnerAjaxLink.java | 3 ++- .../java/de/agilecoders/wicket/samples/pages/BasePage.html | 2 +- .../de/agilecoders/wicket/samples/pages/ComponentsPage.html | 4 ++-- .../java/de/agilecoders/wicket/samples/pages/SelectPage.html | 2 +- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/button/dropdown/SplitButton.html b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/button/dropdown/SplitButton.html index a3ee6ee99..aba0800b9 100644 --- a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/button/dropdown/SplitButton.html +++ b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/button/dropdown/SplitButton.html @@ -7,7 +7,7 @@
diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.html b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.html index ca52f5559..12aa67dba 100644 --- a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.html +++ b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.html @@ -1,6 +1,6 @@ - + diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.java b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.java index 210c4aa03..3068d0692 100644 --- a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.java +++ b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.java @@ -1,5 +1,6 @@ package de.agilecoders.wicket.core.markup.html.bootstrap.components.progress; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; @@ -9,6 +10,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior; import de.agilecoders.wicket.core.util.Attributes; +import de.agilecoders.wicket.core.util.CssClassNames.Helper; /** * Represents a stack of the progress bar. @@ -57,6 +59,7 @@ protected void onInitialize() { super.onInitialize(); srOnly = new Label("srOnly", createLabelModel()); + srOnly.add(AttributeModifier.append("class", Helper.screenReaderOnly)); add(srOnly); } diff --git a/bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/ProgressBarTest.java b/bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/ProgressBarTest.java index 5d2ba02a2..0f8dacc57 100644 --- a/bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/ProgressBarTest.java +++ b/bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/ProgressBarTest.java @@ -7,6 +7,7 @@ import de.agilecoders.wicket.core.WicketApplicationTest; import de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior; +import de.agilecoders.wicket.core.util.CssClassNames.Helper; /** * Tests for ProgressBar @@ -58,7 +59,7 @@ void progressBarWithDefaultStackMarkup() { assertEquals("" + ProgressBar.MIN, stackTester.getAttribute("aria-valuemin")); assertEquals("" + ProgressBar.MAX, stackTester.getAttribute("aria-valuemax")); - TagTester stackLabelTester = stackTester.getChild("class", "sr-only"); + TagTester stackLabelTester = stackTester.getChild("class", Helper.screenReaderOnly); assertEquals("" + progress + "%", stackLabelTester.getValue()); } diff --git a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxButton.java b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxButton.java index dcb0c874c..1b592da83 100644 --- a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxButton.java +++ b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxButton.java @@ -11,6 +11,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton; import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons; +import de.agilecoders.wicket.core.util.CssClassNames.Helper; /** * A specialization of {@link de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton} @@ -107,7 +108,7 @@ protected void onConfigure() { super.onConfigure(); Component label = get("label"); if (Strings.isEmpty(label.getDefaultModelObjectAsString())) { - label.add(AttributeModifier.append("class", "sr-only")); + label.add(AttributeModifier.append("class", Helper.screenReaderOnly)); } } } diff --git a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxLink.java b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxLink.java index 9f43409f0..5c58b57f2 100644 --- a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxLink.java +++ b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxLink.java @@ -10,6 +10,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink; import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons; +import de.agilecoders.wicket.core.util.CssClassNames.Helper; /** * A specialization of {@link de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink} @@ -102,7 +103,7 @@ protected void onConfigure() { super.onConfigure(); Component label = get("label"); if (Strings.isEmpty(label.getDefaultModelObjectAsString())) { - label.add(AttributeModifier.append("class", "sr-only")); + label.add(AttributeModifier.append("class", Helper.screenReaderOnly)); } } } diff --git a/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BasePage.html b/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BasePage.html index 7b1e525b9..fc1c3a83a 100644 --- a/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BasePage.html +++ b/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BasePage.html @@ -13,7 +13,7 @@ - Skip navigation +
diff --git a/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ComponentsPage.html b/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ComponentsPage.html index 74e6cd01c..ce13e6ffe 100644 --- a/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ComponentsPage.html +++ b/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ComponentsPage.html @@ -1538,14 +1538,14 @@

Pills

Submit - unread messages + 
             <button wicket:id="badge-button">
                 Submit <span wicket:id="button-count"></span>
-                <span class="sr-only">unread messages</span>
+                <span class="visually-hidden">unread messages</span>
             </button>
diff --git a/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SelectPage.html b/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SelectPage.html index 3b571ecf0..2b357fcd6 100644 --- a/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SelectPage.html +++ b/bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SelectPage.html @@ -82,7 +82,7 @@

Example