XWIKI-22433: Provide consistency in info / warning / error class usages in templates #3555
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…es in templates * Part A
…es in templates * Velocity macro update
…es in templates * Part B * extensionHistory.vm * extension.vm * distribution/macros.vm * template/macros.vm * Extensions.xml * AnnotationCode/Macros.xml
…es in templates * Part C * ExtensionSecurity/Admin.xml * edit_macros.vm * LiveTableViewSheet.xml * OfficeImporterAdmin.xml * Annotations/Settings.xml
…es in templates * * Velocity macro update
…es in templates * Part D * job_macros.vm * children.vm * ExtensionBreakingQuestion.form.vm * XClassBreakingQuestion.form.vm
…es in templates * Misc - doubled icon regression
…es in templates * Part E * AttachmentGalleryPickerMacro.java fails with `You must inject a component role. Got [org.xwiki.rendering.internal.macro.message.WarningMessageMacro] at L.87`
…es in templates * Part E * OfficeImporter.xml * XObjectDisplayerProvider.java (WIP) * CreateApplication.xml
…es in templates * Velocity macro update
…es in templates * Part F * ClassEditSheet.xml * CreateWiki.xml (partially tested) * LiveTableEditSheet.xml * macros.vm * editobject.vm (WIP)
…es in templates * Part G * job_status_json.vm * uploadfailure.vm * FilterStreamJobJSON.xml
…es in templates * Part H
…es in templates * Part H
…es in templates * Part I
…es in templates * Part J * Added velocity macro to support the inline mode
…es in templates * Part H - fix
…es in templates * Part F - fix
…es in templates * Part C - fix
…es in templates * Part B - fix
…es in templates * Part F - fix
…es in templates * Part E - codestyle
…es in templates * Part C - fix
…es in templates * Part A - fix
…es in templates * Part G - fix
…es in templates * Part G - fix
tmortagne
reviewed
Feb 25, 2025
...m-invitation/xwiki-platform-invitation-ui/src/main/resources/Invitation/InvitationCommon.xml
Outdated
Show resolved
Hide resolved
michitux
reviewed
Feb 25, 2025
...amingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/editobject.vm
Outdated
Show resolved
Hide resolved
michitux
reviewed
Feb 25, 2025
...m-invitation/xwiki-platform-invitation-ui/src/main/resources/Invitation/InvitationCommon.xml
Outdated
Show resolved
Hide resolved
michitux
reviewed
Feb 25, 2025
...-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/macros.vm
Outdated
Show resolved
Hide resolved
michitux
reviewed
Feb 25, 2025
...tform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/CreateInlinePageTest.java
Show resolved
Hide resolved
michitux
reviewed
Feb 25, 2025
...ttachment/xwiki-platform-attachment-api/src/test/java/org/xwiki/attachment/MovePageTest.java
Outdated
Show resolved
Hide resolved
…es in templates * Fixed escaping and syntax in LiveTableEditSheet.xml
…es in templates * Fixed icon mock in MovePageTest.java
…es in templates * Fixed icon mock in MovePageTest.java
…es in templates * Removed a now useless setup step.
…es in templates * Removed a now useless resource file.
…es in templates * Replaced a velocity translation call with the standard translation macro.
…es in templates * Updated the structure of the verlocimacros to take into account the latest bugfixes on the XWiki macros.
…es in templates * Updated mocking in CreateInlinePageTest.java
…es in templates * Updated the structure of the verlocimacros to take into account the latest bugfixes on the XWiki macros.
…es in templates * Updated mocking of the IconManagerScriptService
michitux
reviewed
Feb 25, 2025
...nt/xwiki-platform-attachment-api/src/test/java/org/xwiki/attachment/MoveStatusPagesTest.java
Outdated
Show resolved
Hide resolved
…es in templates * Removed escaping from strings that are not in a HTML context anymore
…es in templates * Added XWiki 2.1 escaping
… usages in templates * Replaced a statement lambda with an expression lambda Co-authored-by: Michael Hamann <michael@content-space.de>
…es in templates * Added XWiki 2.1 escaping
|
All the comments on this PR have been adressed, it is ready for further review or a merge. |
michitux
reviewed
Mar 18, 2025
Comment on lines
672
to
682
| {{/html}} | ||
| #if($request.deleteOk) | ||
| <p class="successmessage box"> | ||
| $services.localization.render('platform.wiki.create.wizard.step.cleaningup.success', ["<strong>$wikiId</strong>"]) | ||
| </p> | ||
| {{success}} | ||
| {{html}}$services.localization.render('platform.wiki.create.wizard.step.cleaningup.success', ["<strong>$wikiId</strong>"]){{/html}} | ||
| {{/success}} | ||
| #else | ||
| <p class="errormessage box"> | ||
| $services.localization.render('platform.wiki.create.wizard.step.cleaningup.error', ["<strong>$wikiId</strong>"]) | ||
| </p> | ||
| {{error}} | ||
| {{html}}$services.localization.render('platform.wiki.create.wizard.step.cleaningup.error', ["<strong>$wikiId</strong>"]){{/html}} | ||
| {{/error}} | ||
| #end | ||
| {{html clean="false"}} |
There was a problem hiding this comment.
Shouldn't there be line breaks between these macros to ensure that all of them are standalone? Did you test this?
There was a problem hiding this comment.
I didn't test this one before AFAIR. Without changes it does indeed set the message as inline.
I committed the changes in 9b30dec 👍
In order to test it, I just called the template with empty parameters.
With the latest changes:
Before the changes in this PR:
…es in templates * Added newlines around macros to make sure they are rendered standalone.
…es in templates * Fixed the latest tests so that JobStatusJSONPageTest build properly with the changes to the error box.
|
Tests:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Jira URL
https://jira.xwiki.org/browse/XWIKI-22433
Changes
Description
Status
I made this table and categories with this order:
.<whatever>message. info--> warning -->error-->success(Table under the
detail dropdown)38 files updated.
Additional file changes
2 files updated
38 + 2 => 40 files total
Screenshots & Video
Invitations.xml
before
after
NotificationAlert.xml
moveStatus.vm
CreateWiki.xml
OfficeImporter.xml
flamingo/macros.vm
Executed Tests
Manual tests only. I did test most of the changes as much as I could on a local live instance. The changes are across a very large scope. From what I could see, adding a class to the item did not break docker tests.
Expected merging strategy