-
Notifications
You must be signed in to change notification settings - Fork 162
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added missing caret for BootstrapSelectFilter. Improved ColorBehaviors #1027
Added missing caret for BootstrapSelectFilter. Improved ColorBehaviors #1027
Conversation
Backgroundcolor Behaviors. Little sample adjustments. Fixed CodeBehavior Line Numbers.
The PR is too big!
Maybe you could split it into several small ones?
Please try to not make formatting changes too!
…On Fri, 12 Jan 2024 at 18:39, namtar ***@***.***> wrote:
BoostrapSelectFilter
When using the BootstrapSelectFilter for example with a data table no
caret is displayed for the DropDownChoice. This is because of a wrong css
class set in the
de/agilecoders/wicket/extensions/markup/html/bootstrap/table/filter/BootstrapSelectFilter.html
markup file. Now a caret should be displayed.
ColorBehaviors
I did some colorBehavior changes and added the ability to set opacity to
texts or backgrounds and gradients to backgrounds, too. I changed existing
classes and added new ones. Also I renamed Color enums. For example
ColorBehavior.Color is now TextColorBehavior.TextColor.
There is an enum BackgroundColor for a BackgroundColorBehavior and a
TextAndBackgroundColor for a TextAndBackgroundColorBehavior. The latter one
is a behavior for
https://getbootstrap.com/docs/5.3/helpers/color-background/ which
determines automatically a contrasting textColor for a given background
color.
The color changes may lead to compile errors on projects that use
wicket-bootstrap and require mostly adjustments of class imports or the
change of a method name. If this is a problem then reject this pull request
and I will do a new one only for the BootstrapSelectFilter and CodeBehavior.
CodeBehavior
I changed the initializerScript line in the CodeBehavior as proposed here (
#711 <#711>). Line
numbers are shown again now, but since the google code-prettify project is
archived perhaps it would be an idea to integrate the highlight.js library.
------------------------------
You can view, comment on, or merge this pull request online at:
#1027
Commit Summary
- 933dec0
<933dec0>
Added missing caret for BootstrapSelectFilter. Improved Text and
File Changes
(48 files <https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files>
)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/badge/BadgeBehavior.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-f07975d8a6f78090be9f6b478a76891ab820aa5e7c88aec70364c62b0ce3dc7a>
(25)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/badge/BootstrapBadge.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-a95e0ec873a99521274396d3815392aea3b1ffde17b183710c1d70bf08e4df33>
(24)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/block/CodeBehavior.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-d46717a1f3b3475bb0fd6adccf99df97d8c6450b52300c20448dfa50df06c797>
(340)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/block/Jumbotron.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-1cd3ecc786d168cfa65109dccbb093395e000c953ea544efdad83e677781c2a1>
(74)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/block/JumbotronBehavior.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-f7564b7c2489a724bdd3e388684baae9970ead4d3b082a7833cbcd0c53bcd13a>
(76)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/ProgressBar.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-1669ee4a440e0131ee37ce2a8c0cc6b2cc023a08c5f52f9ec1de9dc5fc0a871c>
(28)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-d27a4a452819d4b6801734641feb9326a758bb7e2ff6b35ee9237013bf2e73b6>
(11)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/UpdatableProgressBar.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-fc9bfaaee3cbaec74a7e8ea80425e1afbbf40abeff0fb00102000f9a5b8c5791>
(12)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/UploadProgressBar.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-a0a4a5cf83afce6061f1072692ec3597fc3da7d493e732bce54a302ca541fb7d>
(13)
- *D*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/helpers/ColorAndBackgroundBehavior.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-97d8f57a7e79a0697dea3bfa17d6b6f7d4fe557608cb5be59818d716b0e40749>
(181)
- *A*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/helpers/TextAndBackgroundColorBehavior.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-6d685cb12de47fdc87f03f549ac9f50c9ccf4ef5d05c0c96e8a4dd68292436e7>
(126)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/navbar/Navbar.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-c20d6da3dd82c8892a92567effce24bbe834954e184aa9f9eb92070f07f3849d>
(43)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/panel/BootstrapGenericPanel.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-8e66bbb3c9ddf26ed48c993a8f2157ace38b035db7bbc3bb9bd0ba4328641b2a>
(24)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/panel/PanelType.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-4e1aef5d17541d40c5527d2444421cf1daef455c205d6ba2673c1f2a920b5497>
(68)
- *M*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/utilities/BackgroundColorBehavior.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-419094c8f3e3a821535f769475b6d8cf8c7bdfe3ea6957aa9a8ffaf38db687e2>
(644)
- *A*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/utilities/BackgroundOpacity.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-a8aa0b92b2dd7b8bae86769378316e7ab5afb5bcb529a0e405c9abd09d3b2071>
(30)
- *D*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/utilities/ColorBehavior.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-cfe199968915aed4b4a6032cbcc3237e60682a114f984ec6d780eab18d71aec6>
(318)
- *A*
bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/utilities/TextColorBehavior.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-68bb6617740fc3b75bedcbfde2f9c0cbe0c49a840139ad21e2e9b30bc66d82ca>
(397)
- *M* bootstrap-core/src/main/java/module-info.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-befe51282a30a2f5659e62ef27d465ff2e1cab153b736f7e9989df3782909262>
(3)
- *M*
bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/ProgressBarTest.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-26c1edfd00f50a34ed517d6203e18c010f574cb47b43d2494b921b79439ea3bd>
(5)
- *M*
bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/navbar/NavbarTest.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-52d37f1ab51961c0d0593c394ebc3bd0810e25c06dc006a1a1956a7b33e38334>
(39)
- *M*
bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/utilities/BackgroundColorBehaviorTest.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-39452052a86a926a54fbd15591966da64eb0d3ef32b4c1e8dc51f2a1dcf7be9d>
(70)
- *D*
bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/utilities/ColorBehaviorTest.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-c12b05940ca5b32ca012ab690d5b111d7685f3d719c8afb6640e514c804c2b12>
(32)
- *A*
bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/utilities/color/TextAndBackgroundColorBehaviorTest.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-022145b04fda1b32fc6e45af2d44dee8b99facf08181a6ed231dfcbdb87eb317>
(32)
- *A*
bootstrap-core/src/test/java/de/agilecoders/wicket/core/markup/html/bootstrap/utilities/color/TextColorBehaviorTest.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-114c9b58335c9ea16de759d1cd13591e63423cd2868091901392262ed08c1025>
(51)
- *M*
bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/filter/BootstrapSelectFilter.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-6b060493a39e0468e392f79ef42a4bc7a8f26375f5e6fb50f0aa0998363686f8>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BaseCssPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-92f59091fd44c0f5fc46279969508c495c5fe0797f9fa56af136296b5d8c18aa>
(2799)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BasePage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-960fdb0fc73dfe34ad9566b5272ae1a977d9096ea48d961ec6099384d83c231a>
(23)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BasePage.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-833b2a3a1616364ee93616fffbb3cdc7dbdb5aaa44a84970123f26fa1d47883f>
(33)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BaseValidationPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-66d46827445d445b31d2533fdd9b17fd009ebc437fee5195935d30cd00a6e65c>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/CheckboxesPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-b00015cb76923660bb47f1f8b5b5fc78c1a9763d89aaeece51da9590387fa5d9>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ComponentsPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-a538e359e332be4bb1f02740f6e43a6fa605a3477321bfa5228a9c482a9f9302>
(3031)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ComponentsPage.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-8216acb9268709c4b61b16d50c0f8a48f1f92bf3786fcc0b6855dd1f8513e3b3>
(71)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/DataTablePage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-c78df61a9e74ee4d81559273b2e97a0c7b01a45cbd902e27fa2118b0f0b62413>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/DatePickerPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-b5a63480055052f76d134241089786f2e16d95913c7fd85f632ccd2c84791880>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/DatetimePickerPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-2851f655c8743185ea2d3c291cd3ff6e958c3c9266a22dfa822afa1697d3f049>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ExtensionsBootstrapFileInputPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-a6ac8cd40497ce7f6507cb9d8a6f46cfc0360a3c478ef7f54e6076e51f40c408>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ExtensionsPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-e78c3b230bad000f1f31d91ac15e7af57e54f8a0c8bdafb829e3d1057c0af51b>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/FontAwesomePage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-d6afe7885a325641e74d9d558ab2fe827bd6556daa43e03a3ae16a6e2c73b95e>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/HomePage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-81f20983b7135344b458049953a981b9e3daa702a0f2e2d6e5c66f9217898ef8>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/IssuesPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-3787f8555e881e37a7f1b2194cfae6ef91633f3be142c47f22131fdaee01e24e>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/JavascriptPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-14e619c180b8b845fb9a0470e0a352f3ba7d7d4b8bcd92394724dfcd1598b9f8>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/MarkdownPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-075347e2c427e1c9507fcffd7ee0654a1bd195a3e3fc8e145961f79a96c8b65c>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SelectPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-a4618d037cd543ab7e82c5520c9ef89709e91368e7322e18fc110a73edd90943>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SummernotePage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-72be7ac050f70518ae98861b76e6e257491ca55641af277146a8577f5e6e7fb8>
(2)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/UtilitiesPage.html
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-f3ac0c7524816f5afd7875989b7ed38dc5bc984038d894d6edc54dbe373c7c8b>
(438)
- *M*
bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/UtilitiesPage.java
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-ca87cd3f439ebad15597ef72adcc287de9f47d369f2f51f9f49923ad90ed5bda>
(740)
- *M* pom.xml
<https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027/files#diff-9c5fb3d1b7e3b0f54bc5c4182965c4fe1f9023d449017cece3005d3f90e8e4d8>
(2)
Patch Links:
- https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027.patch
- https://github.com/l0rdn1kk0n/wicket-bootstrap/pull/1027.diff
—
Reply to this email directly, view it on GitHub
<#1027>, or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AABYUQVWKYJFL5HNVHPC67LYOFRLVAVCNFSM6AAAAABBYM3VRCVHI2DSMVQWIX3LMV43ASLTON2WKOZSGA3TSMRVGI2TEMI>
.
You are receiving this because you are subscribed to this thread.Message
ID: ***@***.***>
|
It will also break all existing applications that use behaviors that were renamed, even though I like some names better, what's your approach in this case @martin-g? |
Ok. No problem. I will split the pull request. Is there a rule how the code formatting has to be done? I assumed that the .ediorconfig file is followed by Intellij IDEA and has the formatting rules that should be applied. @vrozkovec I saw that Bootstrap has Utilities and Helpers sections and because of that I kept the matching behaviors in the corresponding packages. The word colors is very general though in this section (Utilities > Colors) they only add colors to text. Therefore I thought it would be a good idea to name the Enums and Behaviors as I have done in order to be more specific. |
BoostrapSelectFilter
When using the BootstrapSelectFilter for example with a data table no caret is displayed for the DropDownChoice. This is because of a wrong css class set in the de/agilecoders/wicket/extensions/markup/html/bootstrap/table/filter/BootstrapSelectFilter.html markup file. Now a caret should be displayed.
ColorBehaviors
I did some colorBehavior changes and added the ability to set opacity to texts or backgrounds and gradients to backgrounds, too. I changed existing classes and added new ones. Also I renamed Color enums. For example ColorBehavior.Color is now TextColorBehavior.TextColor.
There is an enum BackgroundColor for a BackgroundColorBehavior and a TextAndBackgroundColor for a TextAndBackgroundColorBehavior. The latter one is a behavior for https://getbootstrap.com/docs/5.3/helpers/color-background/ which determines automatically a contrasting textColor for a given background color.
The color changes may lead to compile errors on projects that use wicket-bootstrap and require mostly adjustments of class imports or the change of a method name. If this is a problem then reject this pull request and I will do a new one only for the BootstrapSelectFilter and CodeBehavior.
CodeBehavior
I changed the initializerScript line in the CodeBehavior as proposed here (#711). Line numbers are shown again now, but since the google code-prettify project is archived perhaps it would be an idea to integrate the highlight.js library.