... |
... |
@@ -2,42 +2,26 @@ |
2 |
2 |
#set($headline = "$!wikimacro.parameters.headline") |
3 |
3 |
#set($url = "$!wikimacro.parameters.url") |
4 |
4 |
#set($description = "$!wikimacro.parameters.description") |
5 |
|
-#set($image = "$!wikimacro.parameters.image") |
|
5 |
+#set($imageParam = "$!wikimacro.parameters.image") |
6 |
6 |
|
7 |
|
-## Left side: Copyable syntax |
8 |
|
-{{box title="Wiki Syntax (Copy and paste this)" cssClass="infobox" style="width:48%; float:left; margin-right:2%;"}} |
9 |
|
-(% style="margin-bottom:20px; width:100%" %) |
10 |
|
-| #if($image != "") |
11 |
|
- [[image:$image||data-xwiki-image-style="thumbnail-clickable" style="border:1px solid #ccc" width="200"]] |
12 |
|
- #else |
13 |
|
- No image provided. |
14 |
|
- #end | |
15 |
|
-=== [[$headline>>$url]] === |
|
7 |
+## Build incident block with careful escaping |
|
8 |
+#set($block = '(% style="margin-bottom:20px; width:100%" %)') |
|
9 |
+#set($block = "$block\n") |
16 |
16 |
|
17 |
|
-$description |
18 |
|
- |
19 |
|
-[[Read More>>$url]] |
20 |
|
-{{/box}} |
21 |
|
- |
22 |
|
-## Right side: Preview |
23 |
|
-{{box title="Preview" cssClass="floatinginfobox" style="width:48%; float:left;"}} |
24 |
|
-#if($image && $image != "") |
25 |
|
- [[image:$image||width="200" style="border:1px solid #ccc;"]] |
|
11 |
+#if($imageParam && $imageParam != "") |
|
12 |
+ #set($block = "$block|[[image:$imageParam||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]| \n") |
26 |
26 |
#else |
27 |
|
- (% style="width:200px; height:150px; background:#eee; text-align:center; border:1px solid #ccc;" %) |
28 |
|
- No image |
29 |
|
- (%) |
|
14 |
+ #set($block = "$block|No image provided.| \n") |
30 |
30 |
#end |
31 |
31 |
|
32 |
|
-=== [[$headline>>$url]] === |
|
17 |
+#set($block = "$block\n=== [[$headline>>$url]] ===\n\n") |
|
18 |
+#set($block = "$block$description\n\n[[Read More>>$url]]") |
33 |
33 |
|
34 |
|
-$description |
|
20 |
+## Append to current document |
|
21 |
+#set($doc = $xwiki.getDocument($doc.fullName)) |
|
22 |
+#set($content = $doc.getContent()) |
|
23 |
+$doc.setContent("$content\n\n$block") |
|
24 |
+$doc.save() |
35 |
35 |
|
36 |
|
-[[Read More>>$url]] |
37 |
|
-{{/box}} |
38 |
|
- |
39 |
|
-## Clear the floats |
40 |
|
-(% style="clear:both;" %) |
41 |
|
-(%) |
|
26 |
+<div class="alert alert-success">Incident added successfully to the page.</div> |
42 |
42 |
{{/velocity}} |
43 |
|
- |