Changes for page SubmitIncidentMacro
Summary
Details
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,27 +1,33 @@ 1 1 {{velocity}} 2 -#set($headline = "$!wikimacro.parameters.headline") 3 -#set($url = "$!wikimacro.parameters.url") 4 -#set($description = "$!wikimacro.parameters.description") 5 -#set($image = "$!wikimacro.parameters.image") 6 6 7 -## Simple table format 8 -#set($wikiText = "|") 9 -#if($image && $image != "") 10 - #set($wikiText = "$wikiText[[image:$image||width=\"200\"]]|") 11 -#else 12 - #set($wikiText = "$wikiText No image |") 3 +#set($headline = $wikimacro.parameters.headline) 4 +#set($url = $wikimacro.parameters.url) 5 +#set($desc = $wikimacro.parameters.description) 6 +#set($imageParam = $wikimacro.parameters.image) 7 + 8 +#set($resolvedImage = "") 9 +#if ($imageParam && $services.rendering) 10 + #set($ref = $services.rendering.resolveDocumentResourceReference($imageParam, 'attachment')) 11 + #if ($ref) 12 + #set($resolvedImage = $ref.resourceReference.reference) 13 + #else 14 + #set($resolvedImage = $imageParam) 15 + #end 13 13 #end 14 14 15 -## Add title and description 16 -#set($wikiText = "$wikiText\n\n=== [[$headline>>$url]] ===\n\n$description\n\n[[Read More>>$url]]\n\n") 18 +## Build incident block line by line 19 +#set($block = "(% style=\"margin-bottom:20px; width:100%\" %)\n") 20 +#set($block = "${block}|[[image:${resolvedImage}||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]| \n") 21 +#set($block = "${block}\n=== [[$headline>>$url]] ===\n\n") 22 +#set($block = "${block}$desc\n[[Read More>>$url]]") 17 17 18 -## Append to current document19 -#set($ currentDoc = $xwiki.getDocument($doc.fullName))20 -#set($c urrentContent = $currentDoc.getContent())21 -$ currentDoc.setContent("$currentContent\n\n$wikiText")22 -$ currentDoc.save()24 +## Append to current page 25 +#set($doc = $xwiki.getDocument($doc.fullName)) 26 +#set($content = $doc.getContent()) 27 +$doc.setContent("${content}\n\n${block}") 28 +$doc.save() 23 23 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> 30 +<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div> 31 + 27 27 {{/velocity}} 33 + - Macro content type
-
... ... @@ -1,1 +1,0 @@ 1 -Unknown - Macro visibility
-
... ... @@ -1,1 +1,0 @@ 1 -Current Wiki
- XWiki.WikiMacroParameterClass[0]
-
- Parameter advanced
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter feature mandatory.
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter hidden
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter type
-
... ... @@ -1,1 +1,0 @@ 1 -Unknown
- XWiki.WikiMacroParameterClass[1]
-
- Parameter advanced
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter description
-
... ... @@ -1,1 +1,5 @@ 1 + 2 + 1 1 The source URL of the incident (link) 4 + 5 + - Parameter feature mandatory.
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter hidden
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter type
-
... ... @@ -1,1 +1,0 @@ 1 -Unknown
- XWiki.WikiMacroParameterClass[3]
-
- Parameter deprecated
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter description
-
... ... @@ -1,1 +1,0 @@ 1 -Description of the incident - Parameter group
-
... ... @@ -1,1 +1,0 @@ 1 -Main Info - Parameter mandatory
-
... ... @@ -1,1 +1,0 @@ 1 -Yes - Parameter name
-
... ... @@ -1,1 +1,0 @@ 1 -description - Parameter type
-
... ... @@ -1,1 +1,0 @@ 1 -Wiki
- XWiki.WikiMacroParameterClass[4]
-
- Parameter description
-
... ... @@ -1,1 +1,0 @@ 1 -Upload or select an image to display with the incident (e.g. myimage.jpg) - Parameter mandatory
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter name
-
... ... @@ -1,1 +1,0 @@ 1 -image - Parameter type
-
... ... @@ -1,1 +1,0 @@ 1 -Unknown
- XWiki.WikiMacroParameterClass[2]
-
- Parameter advanced
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter deprecated
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter description
-
... ... @@ -1,0 +1,1 @@ 1 +The name of the image attached to this page (e.g. myimage.jpg) - Parameter feature mandatory.
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter group
-
... ... @@ -1,0 +1,1 @@ 1 +Media - Parameter hidden
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter mandatory
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter name
-
... ... @@ -1,0 +1,1 @@ 1 +Image - Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +org.xwiki.rendering.macro.descriptor.parameter.DocumentResourceReference