... |
... |
@@ -4,20 +4,23 @@ |
4 |
4 |
#set($description = "$!wikimacro.parameters.description") |
5 |
5 |
#set($imageParam = "$!wikimacro.parameters.image") |
6 |
6 |
|
7 |
|
-## Build incident block in the exact format shown in the examples |
8 |
|
-#set($block = "(% style=\"margin-bottom:20px; width:100%\" %)\n") |
|
7 |
+## Build incident block with careful escaping |
|
8 |
+#set($block = '(% style="margin-bottom:20px; width:100%" %)') |
|
9 |
+#set($block = "$block\n") |
|
10 |
+ |
9 |
9 |
#if($imageParam && $imageParam != "") |
10 |
|
- #set($block = "${block}|[[image:${imageParam}||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #cccccc\" width=\"200\"]]| \n") |
|
12 |
+ #set($block = "$block|[[image:$imageParam||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]| \n") |
11 |
11 |
#else |
12 |
|
- #set($block = "${block}|No image provided.| \n") |
|
14 |
+ #set($block = "$block|No image provided.| \n") |
13 |
13 |
#end |
14 |
|
-#set($block = "${block}\n=== [[$headline>>$url]] ===\n\n") |
15 |
|
-#set($block = "${block}$description\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 |
+ |
17 |
17 |
## Append to current document |
18 |
18 |
#set($doc = $xwiki.getDocument($doc.fullName)) |
19 |
19 |
#set($content = $doc.getContent()) |
20 |
|
-$doc.setContent("${content}\n\n${block}") |
|
23 |
+$doc.setContent("$content\n\n$block") |
21 |
21 |
$doc.save() |
22 |
22 |
|
23 |
23 |
<div class="alert alert-success">Incident added successfully to the page.</div> |