Changes for page AutoGallery

Summary

• Objects (1 modified, 0 added, 0 removed)
  • XWiki.WikiMacroClass[0]

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,27 +1,28 @@
1		-import org.xwiki.rendering.block.*
2		-import org.xwiki.rendering.listener.*
3		-import org.xwiki.rendering.syntax.Syntax
	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
4	4
5	5	def attachments = doc.getAttachmentList().findAll {
6		- it.filename.toLowerCase().matches('.*\\.(jpg|jpeg|png|gif)$')
	10	+ it.filename.toLowerCase() ==~ /.*\.(jpg|jpeg|png|gif)$/
7	7	}
8	8
9	9	def blocks = []
10	10
11	11	if (attachments.isEmpty()) {
12		- blocks << new ParagraphBlock([
13		- new WordBlock("No images available.")
14		- ])
	16	+ blocks << new GroupBlock([ new WordBlock("No images available.") ])
15	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		- }
	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	+ }
21	21
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)
	25	+ blocks << new DivBlock(imageBlocks, [ "style": "display: flex; flex-wrap: wrap; gap: 10px;" ])
25	25	}
26	26
27	27	wikimacro.result = blocks