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 2023/03/28 13:50:27 UTC
[myfaces-tobago] branch main updated: fix(theme): .form-select
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/main by this push:
new b913ba577a fix(theme): .form-select
b913ba577a is described below
commit b913ba577a0b1edf7e92c7abbeb2b027f834aa0d
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Mar 28 15:23:12 2023 +0200
fix(theme): .form-select
use .form-select instead of .form-control for
* selectOneListbox
* selectManyListbox
* selectManyShuttle
* adjust test
Issue: TOBAGO-2207
---
.../internal/renderkit/renderer/SelectManyListboxRenderer.java | 2 +-
.../internal/renderkit/renderer/SelectManyShuttleRenderer.java | 4 ++--
.../internal/renderkit/renderer/SelectOneListboxRenderer.java | 2 +-
.../test/resources/renderer/selectManyShuttle/error-message.html | 4 ++--
tobago-core/src/test/resources/renderer/selectManyShuttle/help.html | 4 ++--
.../src/test/resources/renderer/selectManyShuttle/label.html | 4 ++--
.../src/test/resources/renderer/selectManyShuttle/simple.html | 6 +++---
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
index 4e6b23d137..a4b9714ff3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
@@ -73,7 +73,7 @@ public class SelectManyListboxRenderer<T extends AbstractUISelectManyListbox> ex
writer.writeAttribute(HtmlAttributes.TABINDEX, component.getTabIndex());
writer.writeClassAttribute(
- BootstrapClass.FORM_CONTROL,
+ BootstrapClass.FORM_SELECT,
BootstrapClass.validationColor(ComponentUtils.getMaximumSeverity(component)),
component.getCustomClass(),
markup != null && markup.contains(Markup.SPREAD) ? TobagoClass.SPREAD : null);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
index f3e543d11c..b4e30980a7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
@@ -86,7 +86,7 @@ public class SelectManyShuttleRenderer<T extends AbstractUISelectManyShuttle> ex
// TODO tabIndex
writer.writeAttribute(HtmlAttributes.TABINDEX, component.getTabIndex());
- writer.writeClassAttribute(TobagoClass.UNSELECTED, BootstrapClass.FORM_CONTROL);
+ writer.writeClassAttribute(TobagoClass.UNSELECTED, BootstrapClass.FORM_SELECT);
writer.writeAttribute(HtmlAttributes.MULTIPLE, true);
writer.writeAttribute(HtmlAttributes.SIZE, size);
@@ -122,7 +122,7 @@ public class SelectManyShuttleRenderer<T extends AbstractUISelectManyShuttle> ex
writer.writeClassAttribute(
TobagoClass.SELECTED,
BootstrapClass.validationColor(ComponentUtils.getMaximumSeverity(component)),
- BootstrapClass.FORM_CONTROL);
+ BootstrapClass.FORM_SELECT);
writer.writeAttribute(HtmlAttributes.MULTIPLE, true);
writer.writeAttribute(HtmlAttributes.SIZE, size);
renderSelectItems(component, null, items, values, submittedValues, true, writer, facesContext);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
index 833eff85df..c57949a6be 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
@@ -72,7 +72,7 @@ public class SelectOneListboxRenderer<T extends AbstractUISelectOneListbox> exte
writer.writeAttribute(HtmlAttributes.TABINDEX, component.getTabIndex());
writer.writeClassAttribute(
- BootstrapClass.FORM_CONTROL,
+ BootstrapClass.FORM_SELECT,
BootstrapClass.validationColor(ComponentUtils.getMaximumSeverity(component)),
component.getCustomClass(),
markup != null && markup.contains(Markup.SPREAD) ? TobagoClass.SPREAD : null);
diff --git a/tobago-core/src/test/resources/renderer/selectManyShuttle/error-message.html b/tobago-core/src/test/resources/renderer/selectManyShuttle/error-message.html
index bdf7cef9bb..d189e620fa 100644
--- a/tobago-core/src/test/resources/renderer/selectManyShuttle/error-message.html
+++ b/tobago-core/src/test/resources/renderer/selectManyShuttle/error-message.html
@@ -18,7 +18,7 @@
<tobago-select-many-shuttle id='id' class='tobago-auto-spacing'>
<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='a test'>
<div class='tobago-body' title='a test'>
- <select id='id::unselected' class='tobago-unselected form-control' multiple='multiple' size='2'>
+ <select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
<option value=''>Value 1
</option>
<option value=''>Value 2
@@ -31,7 +31,7 @@
<button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button>
</div>
</div>
- <select id='id::selected' class='tobago-selected is-error form-control' multiple='multiple' size='2'></select>
+ <select id='id::selected' class='tobago-selected is-error form-select' multiple='multiple' size='2'></select>
<select class='d-none' id='id::hidden' name='id' multiple='multiple'>
<option value=''>Value 1
</option>
diff --git a/tobago-core/src/test/resources/renderer/selectManyShuttle/help.html b/tobago-core/src/test/resources/renderer/selectManyShuttle/help.html
index 97739d3f61..1e2bf2090a 100644
--- a/tobago-core/src/test/resources/renderer/selectManyShuttle/help.html
+++ b/tobago-core/src/test/resources/renderer/selectManyShuttle/help.html
@@ -18,7 +18,7 @@
<tobago-select-many-shuttle id='id' class='tobago-auto-spacing'>
<div class='tobago-help-container tobago-button-right' data-tobago-help='Help!'>
<div class='tobago-body'>
- <select id='id::unselected' class='tobago-unselected form-control' multiple='multiple' size='2'>
+ <select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
<option value=''>Value 1
</option>
<option value=''>Value 2
@@ -31,7 +31,7 @@
<button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button>
</div>
</div>
- <select id='id::selected' class='tobago-selected form-control' multiple='multiple' size='2'></select>
+ <select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select>
<select class='d-none' id='id::hidden' name='id' multiple='multiple'>
<option value=''>Value 1
</option>
diff --git a/tobago-core/src/test/resources/renderer/selectManyShuttle/label.html b/tobago-core/src/test/resources/renderer/selectManyShuttle/label.html
index ecca94e2a3..32dcbacd1b 100644
--- a/tobago-core/src/test/resources/renderer/selectManyShuttle/label.html
+++ b/tobago-core/src/test/resources/renderer/selectManyShuttle/label.html
@@ -18,7 +18,7 @@
<tobago-select-many-shuttle id='id' class='tobago-label-container tobago-auto-spacing'>
<label for='id::unselected' class='col-form-label'>label</label>
<div class='tobago-body'>
- <select id='id::unselected' class='tobago-unselected form-control' multiple='multiple' size='2'>
+ <select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
<option value=''>Value 1
</option>
<option value=''>Value 2
@@ -31,7 +31,7 @@
<button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button>
</div>
</div>
- <select id='id::selected' class='tobago-selected form-control' multiple='multiple' size='2'></select>
+ <select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select>
<select class='d-none' id='id::hidden' name='id' multiple='multiple'>
<option value=''>Value 1
</option>
diff --git a/tobago-core/src/test/resources/renderer/selectManyShuttle/simple.html b/tobago-core/src/test/resources/renderer/selectManyShuttle/simple.html
index b54d2f122c..3b21246705 100644
--- a/tobago-core/src/test/resources/renderer/selectManyShuttle/simple.html
+++ b/tobago-core/src/test/resources/renderer/selectManyShuttle/simple.html
@@ -17,7 +17,7 @@
<tobago-select-many-shuttle id='id' class='tobago-auto-spacing'>
<div class='tobago-body'>
- <select id='id::unselected' class='tobago-unselected form-control' multiple='multiple' size='2'>
+ <select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
<option value=''>Value 1
</option>
<option value=''>Value 2
@@ -30,11 +30,11 @@
<button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button>
</div>
</div>
- <select id='id::selected' class='tobago-selected form-control' multiple='multiple' size='2'></select>
+ <select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select>
<select class='d-none' id='id::hidden' name='id' multiple='multiple'>
<option value=''>Value 1
</option>
<option value=''>Value 2
</option></select>
</div>
-</tobago-select-many-shuttle>
\ No newline at end of file
+</tobago-select-many-shuttle>