Changes for page AutoGallery

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

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