... |
... |
@@ -1,27 +1,34 @@ |
1 |
1 |
{{velocity}} |
2 |
|
-#set($headline = "$!wikimacro.parameters.headline") |
3 |
|
-#set($url = "$!wikimacro.parameters.url") |
4 |
|
-#set($description = "$!wikimacro.parameters.description") |
5 |
|
-#set($image = "$!wikimacro.parameters.image") |
|
2 |
+#set($headline = $wikimacro.parameters.headline) |
|
3 |
+#set($url = $wikimacro.parameters.url) |
|
4 |
+#set($desc = $wikimacro.parameters.description) |
|
5 |
+#set($imageParam = $wikimacro.parameters.image) |
6 |
6 |
|
7 |
|
-## Simple table format |
8 |
|
-#set($wikiText = "|") |
9 |
|
-#if($image && $image != "") |
10 |
|
- #set($wikiText = "$wikiText[[image:$image||width=\"200\"]]|") |
|
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) |
|
14 |
+ #end |
|
15 |
+#end |
|
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") |
11 |
11 |
#else |
12 |
|
- #set($wikiText = "$wikiText No image |") |
|
22 |
+ #set($incidentBlock = "${incidentBlock}|No image provided.| \n") |
13 |
13 |
#end |
|
24 |
+#set($incidentBlock = "${incidentBlock}\n=== [[$headline>>$url]] ===\n\n") |
|
25 |
+#set($incidentBlock = "${incidentBlock}$desc\n[[Read More>>$url]]") |
14 |
14 |
|
15 |
|
-## Add title and description |
16 |
|
-#set($wikiText = "$wikiText\n\n=== [[$headline>>$url]] ===\n\n$description\n\n[[Read More>>$url]]\n\n") |
17 |
|
- |
18 |
18 |
## Append to current document |
19 |
|
-#set($currentDoc = $xwiki.getDocument($doc.fullName)) |
20 |
|
-#set($currentContent = $currentDoc.getContent()) |
21 |
|
-$currentDoc.setContent("$currentContent\n\n$wikiText") |
22 |
|
-$currentDoc.save() |
|
28 |
+#set($doc = $xwiki.getDocument($doc.fullName)) |
|
29 |
+#set($content = $doc.getContent()) |
|
30 |
+$doc.setContent("${content}\n\n${incidentBlock}") |
|
31 |
+$doc.save() |
23 |
23 |
|
24 |
|
-<div style="background-color:#dff0d8;color:#3c763d;padding:10px;border:1px solid #d6e9c6;border-radius:4px;"> |
25 |
|
- Incident added successfully to the page. |
26 |
|
-</div> |
|
33 |
+<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div> |
27 |
27 |
{{/velocity}} |