0 Votes

Changes for page AutoGallery

Last modified by Ryan C on 2025/06/17 16:30

From version 3.4
edited by Ryan C
on 2025/06/17 16:11
Change comment: There is no comment for this version
To version 3.6
edited by Ryan C
on 2025/06/17 16:13
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,29 +1,29 @@
1 -import java.util.stream.Collectors
2 -import org.xwiki.rendering.block.XDOM
1 +import org.xwiki.rendering.listener.reference.ResourceReference
2 +import org.xwiki.rendering.listener.reference.ResourceType
3 +import org.xwiki.rendering.block.ImageBlock
4 +import org.xwiki.rendering.block.GroupBlock
5 +import org.xwiki.rendering.block.SpaceBlock
6 +import org.xwiki.rendering.block.DivBlock
7 +import org.xwiki.rendering.block.WordBlock
3 3  
4 4  def attachments = doc.getAttachmentList().findAll {
5 - it.filename.toLowerCase().matches('.*\\.(jpg|jpeg|png|gif)$')
10 + it.filename.toLowerCase() ==~ /.*\.(jpg|jpeg|png|gif)$/
6 6  }
7 7  
13 +def blocks = []
14 +
8 8  if (attachments.isEmpty()) {
9 - def fallback = "{{html}}<div><em>No images available.</em></div>{{/html}}"
10 - def fallbackRendered = services.rendering.parse(fallback, xcontext.syntax).xdom
11 - wikimacro.result = fallbackRendered.children
12 - return
13 -}
16 + blocks << new GroupBlock([ new WordBlock("No images available.") ])
17 +} else {
18 + def imageBlocks = attachments.collect { att ->
19 + def url = "${doc.getExternalURL('download')}/${att.filename.encodeAsURL()}"
20 + def ref = new ResourceReference(url, ResourceType.URL)
21 + def imgBlock = new ImageBlock(ref, true)
22 + return new DivBlock([imgBlock], [ "style": "margin: 5px; display: inline-block;" ])
23 + }
14 14  
15 -def html = new StringBuilder()
16 -html << "{{html}}"
17 -html << "<div style='display:flex; flex-wrap:wrap; gap:10px;'>"
18 -
19 -attachments.each { attachment ->
20 - def url = "${doc.getExternalURL('download')}/${attachment.filename.encodeAsURL()}"
21 - html << "<img src='${url}' style='max-width:200px; height:auto; border:1px solid #ccc;'/>"
25 + blocks << new DivBlock(imageBlocks, [ "style": "display: flex; flex-wrap: wrap; gap: 10px;" ])
22 22  }
23 23  
24 -html << "</div>"
25 -html << "{{/html}}"
28 +wikimacro.result = blocks
26 26  
27 -def rendered = services.rendering.parse(html.toString(), xcontext.syntax).xdom
28 -wikimacro.result = rendered.children
29 -