... |
... |
@@ -1,28 +1,24 @@ |
1 |
|
-import org.xwiki.rendering.block.* |
2 |
|
-import org.xwiki.rendering.listener.* |
3 |
|
-import org.xwiki.rendering.syntax.Syntax |
4 |
|
- |
|
1 |
+{{groovy}} |
5 |
5 |
def attachments = doc.getAttachmentList().findAll { |
6 |
|
- it.filename.toLowerCase().matches('.*\\.(jpg|jpeg|png|gif)$') |
|
3 |
+ it.filename.toLowerCase() ==~ /.*\.(jpg|jpeg|png|gif)$/ |
7 |
7 |
} |
8 |
8 |
|
9 |
|
-def blocks = [] |
|
6 |
+def html = new StringBuilder() |
10 |
10 |
|
11 |
11 |
if (attachments.isEmpty()) { |
12 |
|
- blocks << new ParagraphBlock([ |
13 |
|
- new WordBlock("No images available.") |
14 |
|
- ]) |
|
9 |
+ html << "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 |
|
- } |
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) |
|
11 |
+ html << "<div style='display: flex; flex-wrap: wrap; gap: 10px;'>" |
|
12 |
+ attachments.each { att -> |
|
13 |
+ def safeFilename = $escapetool.url(att.filename) |
|
14 |
+ def url = "${doc.getExternalURL('download')}/${safeFilename}" |
|
15 |
+ html << "<div style='margin: 5px; display: inline-block;'>" |
|
16 |
+ html << "<img src='${url}' style='max-width: 200px;' />" |
|
17 |
+ html << "</div>" |
|
18 |
+ } |
|
19 |
+ html << "</div>" |
25 |
25 |
} |
26 |
26 |
|
27 |
|
-wikimacro.result = blocks |
|
22 |
+wikimacro.result = $services.rendering.parse(html.toString(), "xhtml/1.0").getChildren() |
|
23 |
+{{/groovy}} |
28 |
28 |
|