... |
... |
@@ -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($imageParam = "$!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 |
|
-## Build incident block with careful escaping |
8 |
|
-#set($block = '(% style="margin-bottom:20px; width:100%" %)') |
9 |
|
-#set($block = "$block\n") |
|
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 |
10 |
10 |
|
11 |
|
-#if($imageParam && $imageParam != "") |
12 |
|
- #set($block = "$block|[[image:$imageParam||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]| \n") |
|
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") |
13 |
13 |
#else |
14 |
|
- #set($block = "$block|No image provided.| \n") |
|
22 |
+ #set($incidentBlock = "${incidentBlock}|No image provided.| \n") |
15 |
15 |
#end |
|
24 |
+#set($incidentBlock = "${incidentBlock}\n=== [[$headline>>$url]] ===\n\n") |
|
25 |
+#set($incidentBlock = "${incidentBlock}$desc\n[[Read More>>$url]]") |
16 |
16 |
|
17 |
|
-#set($block = "$block\n=== [[$headline>>$url]] ===\n\n") |
18 |
|
-#set($block = "$block$description\n\n[[Read More>>$url]]") |
19 |
|
- |
20 |
20 |
## Append to current document |
21 |
21 |
#set($doc = $xwiki.getDocument($doc.fullName)) |
22 |
22 |
#set($content = $doc.getContent()) |
23 |
|
-$doc.setContent("$content\n\n$block") |
|
30 |
+$doc.setContent("${content}\n\n${incidentBlock}") |
24 |
24 |
$doc.save() |
25 |
25 |
|
26 |
|
-<div class="alert alert-success">Incident added successfully to the page.</div> |
|
33 |
+<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div> |
27 |
27 |
{{/velocity}} |