... |
... |
@@ -1,34 +1,19 @@ |
1 |
1 |
{{velocity}} |
2 |
|
-#set($headline = $wikimacro.parameters.headline) |
3 |
|
-#set($url = $wikimacro.parameters.url) |
4 |
|
-#set($desc = $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($image = "$!wikimacro.parameters.image") |
6 |
6 |
|
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") |
21 |
|
-#else |
22 |
|
- #set($incidentBlock = "${incidentBlock}|No image provided.| \n") |
23 |
|
-#end |
24 |
|
-#set($incidentBlock = "${incidentBlock}\n=== [[$headline>>$url]] ===\n\n") |
25 |
|
-#set($incidentBlock = "${incidentBlock}$desc\n[[Read More>>$url]]") |
26 |
|
- |
27 |
|
-## Append to current document |
28 |
|
-#set($doc = $xwiki.getDocument($doc.fullName)) |
29 |
|
-#set($content = $doc.getContent()) |
30 |
|
-$doc.setContent("${content}\n\n${incidentBlock}") |
31 |
|
-$doc.save() |
32 |
|
- |
33 |
|
-<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div> |
|
7 |
+<table style="width:100%;"> |
|
8 |
+ <tr> |
|
9 |
+ <td style="width:200px; vertical-align:top;"> |
|
10 |
+ [[image:$image||data-xwiki-image-style="thumbnail-clickable" width="200" style="border:1px solid #ccc;"]] |
|
11 |
+ </td> |
|
12 |
+ <td style="vertical-align:top; padding-left:20px;"> |
|
13 |
+ <h3><a href="$url" class="wikiexternallink" target="_blank">$headline</a></h3> |
|
14 |
+ <p><strong>$desc</strong></p> |
|
15 |
+ </td> |
|
16 |
+ </tr> |
|
17 |
+</table> |
34 |
34 |
{{/velocity}} |
|
19 |
+ |