... |
... |
@@ -2,27 +2,24 @@ |
2 |
2 |
def attachments = doc.getAttachmentList() |
3 |
3 |
def imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp'] |
4 |
4 |
|
5 |
|
-def galleryImages = attachments.findAll { att -> |
|
5 |
+def images = attachments.findAll { att -> |
6 |
6 |
def ext = att.filename.toLowerCase().tokenize('.').last() |
7 |
7 |
imageExtensions.contains(ext) |
8 |
8 |
} |
9 |
9 |
|
10 |
|
-if (galleryImages) { |
11 |
|
- def blocks = [] |
12 |
|
- galleryImages.each { image -> |
13 |
|
- def url = "$xwiki.getURL(doc.fullName, 'download', "filename=${image.filename}")" |
14 |
|
- blocks.add("<img src='${url}' style='max-width:100%; margin: 10px;'/>") |
|
10 |
+if (images) { |
|
11 |
+ def html = new StringBuilder() |
|
12 |
+ html << "<div style='display:flex; flex-wrap:wrap; gap:10px;'>" |
|
13 |
+ images.each { att -> |
|
14 |
+ def url = "${xwiki.getURL(doc.fullName, 'download', "filename=${att.filename}")}" |
|
15 |
+ html << "<img src='${url}' style='max-width:200px; height:auto; border:1px solid #ccc;'>" |
15 |
15 |
} |
|
17 |
+ html << "</div>" |
16 |
16 |
|
17 |
|
- wikimacro.result = $services.rendering.parse( |
18 |
|
- "<div style='display:flex; flex-wrap:wrap;'>${blocks.join('')}</div>", |
19 |
|
- xcontext.syntax |
20 |
|
- ).children |
|
19 |
+ def rendered = services.rendering.parse(html.toString(), xcontext.syntax) |
|
20 |
+ wikimacro.result = rendered.children |
21 |
21 |
} else { |
22 |
|
- wikimacro.result = $services.rendering.parse( |
23 |
|
- "<em>No image attachments found.</em>", |
24 |
|
- xcontext.syntax |
25 |
|
- ).children |
|
22 |
+ wikimacro.result = services.rendering.parse("<em>No images found.</em>", xcontext.syntax).children |
26 |
26 |
} |
27 |
27 |
{{/groovy}} |
28 |
28 |
|