0 Votes

Changes for page AutoGallery

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

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

Summary

Details

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