Changes for page SubmitIncidentMacro

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -2,26 +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($imageParam = "$!wikimacro.parameters.image")
	5	+#set($image = "$!wikimacro.parameters.image")
6	6
7		-## Build incident block with careful escaping
8		-#set($block = '(% style="margin-bottom:20px; width:100%" %)')
9		-#set($block = "$block\n")
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")
	7	+## Simple table format
	8	+#set($wikiText = "|")
	9	+#if($image && $image != "")
	10	+ #set($wikiText = "$wikiText[[image:$image||width=\"200\"]]|")
13	13	#else
14		- #set($block = "$block|No image provided.| \n")
	12	+ #set($wikiText = "$wikiText No image |")
15	15	#end
16	16
17		-#set($block = "$block\n=== [[$headline>>$url]] ===\n\n")
18		-#set($block = "$block$description\n\n[[Read More>>$url]]")
	15	+## Add title and description
	16	+#set($wikiText = "$wikiText\n\n=== [[$headline>>$url]] ===\n\n$description\n\n[[Read More>>$url]]\n\n")
19	19
20	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()
	19	+#set($currentDoc = $xwiki.getDocument($doc.fullName))
	20	+#set($currentContent = $currentDoc.getContent())
	21	+$currentDoc.setContent("$currentContent\n\n$wikiText")
	22	+$currentDoc.save()
25	25
26		-<div class="alert alert-success">Incident added successfully to the page.</div>
	24	+<div style="background-color:#dff0d8;color:#3c763d;padding:10px;border:1px solid #d6e9c6;border-radius:4px;">
	25	+ Incident added successfully to the page.
	26	+</div>
27	27	{{/velocity}}