Skip to content

XWIKI-23002: The attachment selector create should be a button instead of link #4589

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

XWIKI-23002: The attachment selector create should be a button instead of link #4589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0bcbd0
XWIKI-23002: The attachment selector create should be a button instea…
Sereza7 Sep 17, 2025
e53812b
XWIKI-23002: The attachment selector create should be a button instea…
Sereza7 Sep 17, 2025
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
26 changes: 19 additions & 7 deletions ...m-attachment/xwiki-platform-attachment-ui/src/main/resources/XWiki/AttachmentSelector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ $xwiki.jsx.use($attachmentPickerDocName)
/** AJAX deletion of attachments. */
onDelete : function(event) {
event.stop();
deleteTool = event.element();
deleteTool = event.element().up('a.delete') || event.element();
if (!deleteTool.disabled) {
new XWiki.widgets.ConfirmedAjaxRequest(
deleteTool.readAttribute('href'),
Expand Down Expand Up @@ -680,7 +680,7 @@ $xwiki.jsx.use($attachmentPickerDocName)
/** Update the property with the selected value without reloading the page. */
onSelect : function(event) {
event.stop();
var targetElement = event.element();
var targetElement = event.element().up('a.select') || event.element();
var attachmentName = targetElement.up('.gallery_attachmentbox').down('.gallery_attachmenttitle').title;
var imageSource = targetElement.up('.gallery_attachmentbox.gallery_image');
if (imageSource) {
Expand All @@ -695,7 +695,7 @@ $xwiki.jsx.use($attachmentPickerDocName)
if (this.directSave) {
// save via ajax
if (!targetElement.disabled) {
new Ajax.Request(event.element().href, {
new Ajax.Request(targetElement.href, {
onCreate : function() {
targetElement.disabled = true;
targetElement._x_notif = new XWiki.widgets.Notification("$services.localization.render('core.widgets.confirmationBox.notification.inProgress')", 'inprogress');
Expand Down Expand Up @@ -789,7 +789,13 @@ $xwiki.jsx.use($attachmentPickerDocName)
$$('.attachment-picker-start').invoke('observe', 'click', function(event) {
event.stop();
var targetElement = event.element();
var url = targetElement.href;
let url = null;
if (targetElement.tagName === "a") {
url = targetElement.href;
}
else {
url = targetElement.dataset.modalUrl;
}
if (url.indexOf('?') < 0) {
url += '?';
}
Expand Down Expand Up @@ -1611,9 +1617,15 @@ $xwiki.ssx.use($xcontext.macro.doc.fullName)##
#if ($hasTargetDoc)
#set ($queryString.targetdocname = $targetdoc.fullName)
#end
#set ($linkLabel = $services.rendering.escape($services.rendering.escape($buttontext, 'xwiki/2.1'), 'xwiki/2.1'))
(% class="buttonwrapper" %)[[$linkLabel>>${xcontext.macro.doc.fullName}||queryString="$escapetool.url($queryString)"
class="attachment-picker-start button" title="$services.rendering.escape($buttontext, 'xwiki/2.1')"]](%%)##
#set ($linkLabel = $escapetool.xml($buttontext))
#set ($modalUrl = $escapetool.xml("$xcontext.macro.doc.URL?$escapetool.url($queryString)"))
(% class="buttonwrapper" %)##
{{html clean="false"}}
<button class="attachment-picker-start button"
title="$!{linkLabel}"
data-modal-url="${modalUrl}">$!linkLabel
</button>
{{/html}}(%%)##
#end
#end
{{/velocity}}
Expand Down
8 changes: 3 additions & 5 deletions ...m-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,12 +666,10 @@ span#avatarUpload {

#user-menu-col .attachment-picker {
.buttonwrapper {
.wikilink {
display: flex;
flex-flow: column;
}
display: flex;
flex-flow: column;

a.button {
.button {
.btn;
.btn-default;
border-radius: 0 0 @border-radius-base @border-radius-base;
Expand Down