Changes for page SubmitIncidentMacro

Summary

• Objects (2 modified, 0 added, 0 removed)
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[1]

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,4 +1,5 @@
1	1	{{velocity}}
	2	+
2	2	#set($headline = $wikimacro.parameters.headline)
3	3	#set($url = $wikimacro.parameters.url)
4	4	#set($desc = $wikimacro.parameters.description)
...	...	@@ -14,21 +14,28 @@
14	14	#end
15	15	#end
16	16
17		-## Build incident block
18		-#set($incidentBlock = "(% class=\"incident-block\" %)\n")
	18	+## Construct the block
	19	+#set($builder = "")
	20	+#set($builder = "${builder}(% style=\"margin-bottom:20px; width:100%\" %)\n")
	21	+
	22	+## Add image line
19	19	#if ($resolvedImage && $resolvedImage != "")
20		- #set($incidentBlock = "${incidentBlock}|[[image:${resolvedImage}||width=\"200\" style=\"border:1px solid #ccc\"]]| \n")
	24	+ #set($builder = "${builder}|[[image:${resolvedImage}||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]| \n")
21	21	#else
22		- #set($incidentBlock = "${incidentBlock}|No image provided.| \n")
	26	+ #set($builder = "${builder}|No image provided.| \n")
23	23	#end
24		-#set($incidentBlock = "${incidentBlock}\n=== [[$headline>>$url]] ===\n\n")
25		-#set($incidentBlock = "${incidentBlock}$desc\n[[Read More>>$url]]")
26	26
27		-## Append to current document
	29	+## Add title and body
	30	+#set($builder = "${builder}\n=== [[$headline>>$url]] ===\n\n")
	31	+#set($builder = "${builder}$desc\n[[Read More>>$url]]")
	32	+
	33	+## Save to current doc
28	28	#set($doc = $xwiki.getDocument($doc.fullName))
29	29	#set($content = $doc.getContent())
30		-$doc.setContent("${content}\n\n${incidentBlock}")
	36	+$doc.setContent("${content}\n\n${builder}")
31	31	$doc.save()
32	32
33	33	<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div>
	40	+
34	34	{{/velocity}}
	42	+

XWiki.WikiMacroParameterClass[1]

Parameter description

...	...	@@ -1,1 +1,5 @@
	1	+
	2	+
1	1	The source URL of the incident (link)
	4	+
	5	+