... |
... |
@@ -1,18 +1,27 @@ |
1 |
1 |
{{velocity}} |
2 |
|
-#set($headline = $wikimacro.parameters.headline) |
3 |
|
-#set($url = $wikimacro.parameters.url) |
4 |
|
-#set($description = $wikimacro.parameters.description) |
|
2 |
+#set($headline = "$!wikimacro.parameters.headline") |
|
3 |
+#set($url = "$!wikimacro.parameters.url") |
|
4 |
+#set($description = "$!wikimacro.parameters.description") |
|
5 |
+#set($imageParam = "$!wikimacro.parameters.image") |
5 |
5 |
|
6 |
|
-## Build the incident block in XWiki syntax |
7 |
|
-#set($block = "(% class=\"incident-entry\" %)\n") |
8 |
|
-#set($block = "${block}=== [[$headline>>$url]] ===\n\n") |
9 |
|
-#set($block = "${block}$description\n\n[[Read More>>$url]]") |
|
7 |
+## Build incident block with careful escaping |
|
8 |
+#set($block = '(% style="margin-bottom:20px; width:100%" %)') |
|
9 |
+#set($block = "$block\n") |
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") |
|
13 |
+#else |
|
14 |
+ #set($block = "$block|No image provided.| \n") |
|
15 |
+#end |
|
16 |
+ |
|
17 |
+#set($block = "$block\n=== [[$headline>>$url]] ===\n\n") |
|
18 |
+#set($block = "$block$description\n\n[[Read More>>$url]]") |
|
19 |
+ |
11 |
11 |
## Append to current document |
12 |
12 |
#set($doc = $xwiki.getDocument($doc.fullName)) |
13 |
13 |
#set($content = $doc.getContent()) |
14 |
|
-$doc.setContent("${content}\n\n${block}") |
|
23 |
+$doc.setContent("$content\n\n$block") |
15 |
15 |
$doc.save() |
16 |
16 |
|
17 |
|
-<div class="alert alert-success">Incident added successfully.</div> |
|
26 |
+<div class="alert alert-success">Incident added successfully to the page.</div> |
18 |
18 |
{{/velocity}} |