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.

Sign up for GitHub

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
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...ngo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/editobject.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=.

$services.icon.renderHTML('cross')
$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link')
</a></div>
</div>
#end
#end ## checkPropertyDeprecation
Expand Down
5 changes: 0 additions & 5 deletions ...orm-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/editors/dataeditors.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ div#xwikiobjects input[type="radio"], div#xwikiclassproperties input[type="radio
padding: 8px 2px;
}

.more-actions .edit-all {
display: block;
padding: 2px 18px;
}

/* Object editor */
/* XClass */
.xclass-title {
Expand Down