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.5
edited by Ryan C
on 2025/06/17 16:12
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,29 +1,28 @@
1 -import java.util.stream.Collectors
2 -import org.xwiki.rendering.block.XDOM
1 +import org.xwiki.rendering.block.*
2 +import org.xwiki.rendering.listener.*
3 +import org.xwiki.rendering.syntax.Syntax
3 3  
4 4  def attachments = doc.getAttachmentList().findAll {
5 5   it.filename.toLowerCase().matches('.*\\.(jpg|jpeg|png|gif)$')
6 6  }
7 7  
9 +def blocks = []
10 +
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 -}
12 + blocks << new ParagraphBlock([
13 + new WordBlock("No images available.")
14 + ])
15 +} else {
16 + def children = attachments.collect { att ->
17 + def imgUrl = "${doc.getExternalURL('download')}/${att.filename.encodeAsURL()}"
18 + def imgTag = "<img src='${imgUrl}' style='max-width:200px; height:auto; border:1px solid #ccc; margin:5px;'/>"
19 + new RawBlock(imgTag, Syntax.XHTML_1_0)
20 + }
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;'/>"
22 + blocks << new RawBlock("<div style='display:flex; flex-wrap:wrap;'>", Syntax.XHTML_1_0)
23 + blocks.addAll(children)
24 + blocks << new RawBlock("</div>", Syntax.XHTML_1_0)
22 22  }
23 23  
24 -html << "</div>"
25 -html << "{{/html}}"
27 +wikimacro.result = blocks
26 26  
27 -def rendered = services.rendering.parse(html.toString(), xcontext.syntax).xdom
28 -wikimacro.result = rendered.children
29 -