... |
... |
@@ -2,33 +2,28 @@ |
2 |
2 |
#set($headline = $wikimacro.parameters.headline) |
3 |
3 |
#set($url = $wikimacro.parameters.url) |
4 |
4 |
#set($desc = $wikimacro.parameters.description) |
5 |
|
-#set($imageParam = $wikimacro.parameters.image) |
|
5 |
+#set($imageRef = $wikimacro.parameters.image) |
6 |
6 |
|
7 |
7 |
#set($resolvedImage = "") |
8 |
|
-#if ($imageParam && $services.rendering) |
9 |
|
- #set($ref = $services.rendering.resolveDocumentResourceReference($imageParam, 'attachment')) |
10 |
|
- #if ($ref) |
11 |
|
- #set($resolvedImage = $ref.resourceReference.reference) |
12 |
|
- #else |
13 |
|
- #set($resolvedImage = $imageParam) |
|
8 |
+#if ($imageRef) |
|
9 |
+ #set($resolved = $services.rendering.resolveDocumentResourceReference($imageRef, 'attachment')) |
|
10 |
+ #if ($resolved) |
|
11 |
+ #set($resolvedImage = $resolved.resourceReference.reference) |
14 |
14 |
#end |
15 |
15 |
#end |
16 |
16 |
|
17 |
|
-## Build incident block |
18 |
|
-#set($incidentBlock = "(% class=\"incident-block\" %)\n") |
19 |
|
-#if ($resolvedImage && $resolvedImage != "") |
20 |
|
- #set($incidentBlock = "${incidentBlock}|[[image:${resolvedImage}||width=\"200\" style=\"border:1px solid #ccc\"]]| \n") |
21 |
|
-#else |
22 |
|
- #set($incidentBlock = "${incidentBlock}|No image provided.| \n") |
23 |
|
-#end |
24 |
|
-#set($incidentBlock = "${incidentBlock}\n=== [[$headline>>$url]] ===\n\n") |
25 |
|
-#set($incidentBlock = "${incidentBlock}$desc\n[[Read More>>$url]]") |
|
15 |
+#set($block = " |
|
16 |
+(% style=\"margin-bottom:20px; width:100%\" %) |
|
17 |
+|[[image:$resolvedImage||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]| |
26 |
26 |
|
27 |
|
-## Append to current document |
28 |
|
-#set($doc = $xwiki.getDocument($doc.fullName)) |
29 |
|
-#set($content = $doc.getContent()) |
30 |
|
-$doc.setContent("${content}\n\n${incidentBlock}") |
31 |
|
-$doc.save() |
|
19 |
+=== [[$headline>>$url]] === |
32 |
32 |
|
33 |
|
-<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div> |
|
21 |
+$desc |
|
22 |
+[[Read More>>$url]] |
|
23 |
+") |
|
24 |
+ |
|
25 |
+$doc.setContent("${doc.getContent()}\n\n${block}") |
|
26 |
+$doc.save() |
|
27 |
+<div class=\"xwiki-messages xwiki-successmessage\">Incident added.</div> |
34 |
34 |
{{/velocity}} |
|
29 |
+ |