Changes for page SubmitIncidentMacro
Summary
Details
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,27 +1,34 @@ 1 1 {{velocity}} 2 -#set($headline = "$!wikimacro.parameters.headline")3 -#set($url = "$!wikimacro.parameters.url")4 -#set($desc ription="$!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($imageParam = $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") 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 10 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") 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") 13 13 #else 14 - #set($ block = "$block|No image provided.| \n")22 + #set($incidentBlock = "${incidentBlock}|No image provided.| \n") 15 15 #end 24 +#set($incidentBlock = "${incidentBlock}\n=== [[$headline>>$url]] ===\n\n") 25 +#set($incidentBlock = "${incidentBlock}$desc\n[[Read More>>$url]]") 16 16 17 -#set($block = "$block\n=== [[$headline>>$url]] ===\n\n") 18 -#set($block = "$block$description\n\n[[Read More>>$url]]") 19 - 20 20 ## Append to current document 21 21 #set($doc = $xwiki.getDocument($doc.fullName)) 22 22 #set($content = $doc.getContent()) 23 -$doc.setContent("$content\n\n$ block")30 +$doc.setContent("${content}\n\n${incidentBlock}") 24 24 $doc.save() 25 25 26 -<div class=" alertalert-success">Incident addedsuccessfullyto thepage.</div>33 +<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div> 27 27 {{/velocity}} - 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 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