Skip to content
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

XWIKI-22816: Icon and edit link aren't on the same line anymore when editing single object #3851

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Sereza7
Copy link
Contributor

@Sereza7 Sereza7 commented Jan 29, 2025

Jira URL

https://jira.xwiki.org/browse/XWIKI-22816

Changes

Description

  • Updated the style of the edit all objects link to behave as expected. This means removing customizations that were made to fit a CSS only icon.
  • Added back a cross in the remove deprecated property link.

Screenshots & Video

See the ticket for the buggy looks of this UI before the changes proposed in this PR.
After the changes, here is what it looks like:
Screenshot from 2025-01-29 11-27-16

When hovered, the whole link gets its :hovered style: it's dark blue, and the FA cross takes the same color :)

Executed Tests

None, minor change to the DOM (adding an icon), and CSS layout changes are not tested.

Successfully built the two modules with changes with the quality profile : mvn clean install -f xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war -Pquality and mvn clean install -f xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources -Pquality.

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • 16.10.X, like the cause XWIKI-21236: Object edit mode does not use current icon theme. It's a pretty safe backport.

…editing single object

* Updated the style of the `edit all objects` link to behave as expected. This means removing customizations that were made to fit a CSS only icon.
* Added back a cross in the `remove deprecated property` link.
Copy link
Contributor

@michitux michitux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for taking care of this. Unfortunately, the added line break breaks the computation of the title attribute, this needs to be fixed. Otherwise, this looks good.

@@ -247,7 +247,11 @@
#if ($mustSync)
<div class="box warningmessage deprecatedProperties">
$services.localization.render('core.editors.object.removeDeprecatedProperties.all.info')
<div><a class="syncProperties syncAllProperties" href="$doc.getURL('objectsync')" title="$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link.tooltip')">$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link')</a></div>
<div><a class="syncProperties syncAllProperties" href="$doc.getURL('objectsync')" title="$services.localization
.render('core.editors.object.removeDeprecatedProperties.all.link.tooltip')">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just tested this and this line break breaks the computation of the title of the link. Velocity doesn't support having line breaks in the middle of a call. You could move the line break before title=.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants