Changes for page SubmitIncidentMacro
Summary
Details
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,41 +1,27 @@ 1 1 {{velocity}} 2 -#set($request = $request) 3 -#if($request.getParameter("submitIncident")) 4 - #set($headline = $request.getParameter("headline")) 5 - #set($url = $request.getParameter("url")) 6 - #set($desc = $request.getParameter("description")) 2 +#set($headline = "$!wikimacro.parameters.headline") 3 +#set($url = "$!wikimacro.parameters.url") 4 +#set($description = "$!wikimacro.parameters.description") 5 +#set($image = "$!wikimacro.parameters.image") 7 7 8 -#set($block = ''' 9 -(% style="margin-bottom:20px; width:100%" %) 10 -|[[image:PLACEHOLDER.jpg||alt="image" data-xwiki-image-style="thumbnail-clickable" style="border:1px solid #cccccc" width="200"]]| 11 - 12 -=== [[${headline}>>${url}]] === 13 - 14 -${desc} 15 -[[Read More>>${url}]] 16 -''') 17 - 18 - 19 - #set($doc = $xwiki.getDocument($doc.fullName)) 20 - #set($content = $doc.getContent()) 21 - $doc.setContent("${content}\n\n${block}") 22 - $doc.save() 23 - 24 - <div class=\"xwiki-messages xwiki-successmessage\">Incident added to page.</div> 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 |") 25 25 #end 26 26 27 -<form method="post"> 28 - <h3>Add Incident</h3> 29 - <label>Headline:</label><br/> 30 - <input type="text" name="headline" style="width:100%" /><br/><br/> 15 +## Add title and description 16 +#set($wikiText = "$wikiText\n\n=== [[$headline>>$url]] ===\n\n$description\n\n[[Read More>>$url]]\n\n") 31 31 32 - <label>URL:</label><br/> 33 - <input type="text" name="url" style="width:100%" /><br/><br/> 18 +## Append to current document 19 +#set($currentDoc = $xwiki.getDocument($doc.fullName)) 20 +#set($currentContent = $currentDoc.getContent()) 21 +$currentDoc.setContent("$currentContent\n\n$wikiText") 22 +$currentDoc.save() 34 34 35 - <label>Description:</label><br/> 36 - <textarea name="description" rows="4" style="width:100%"></textarea><br/><br/> 37 - 38 - <input type="submit" name="submitIncident" value="Submit Incident" /> 39 -</form> 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> 40 40 {{/velocity}} 41 - - Macro content type
-
... ... @@ -1,0 +1,1 @@ 1 +Unknown - Macro visibility
-
... ... @@ -1,0 +1,1 @@ 1 +Current Wiki
- XWiki.WikiMacroParameterClass[0]
-
- Parameter advanced
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter feature mandatory.
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter hidden
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +Unknown
- XWiki.WikiMacroParameterClass[1]
-
- Parameter advanced
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter description
-
... ... @@ -1,5 +3,1 @@ 1 - 2 - 3 3 The source URL of the incident (link) 4 - 5 - - Parameter feature mandatory.
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter hidden
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +Unknown
- XWiki.WikiMacroParameterClass[2]
-
- Parameter advanced
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter deprecated
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter description
-
... ... @@ -1,1 +1,0 @@ 1 -The name of the image attached to this page (e.g. myimage.jpg) - Parameter feature mandatory.
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter group
-
... ... @@ -1,1 +1,0 @@ 1 -Media - Parameter hidden
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter mandatory
-
... ... @@ -1,1 +1,0 @@ 1 -No - Parameter name
-
... ... @@ -1,1 +1,0 @@ 1 -Image - Parameter type
-
... ... @@ -1,1 +1,0 @@ 1 -org.xwiki.rendering.macro.descriptor.parameter.DocumentResourceReference
- XWiki.WikiMacroParameterClass[3]
-
- Parameter deprecated
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter description
-
... ... @@ -1,0 +1,1 @@ 1 +Description of the incident - Parameter group
-
... ... @@ -1,0 +1,1 @@ 1 +Main Info - Parameter mandatory
-
... ... @@ -1,0 +1,1 @@ 1 +Yes - Parameter name
-
... ... @@ -1,0 +1,1 @@ 1 +description - Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +Wiki
- XWiki.WikiMacroParameterClass[4]
-
- Parameter description
-
... ... @@ -1,0 +1,1 @@ 1 +Upload or select an image to display with the incident (e.g. myimage.jpg) - Parameter mandatory
-
... ... @@ -1,0 +1,1 @@ 1 +No - Parameter name
-
... ... @@ -1,0 +1,1 @@ 1 +image - Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +Unknown