Changes for page SubmitIncidentMacro
Last modified by Ryan C on 2025/06/08 05:22
From 3.20 to 3.21
Show context
Hide context
Summary
Details
-
XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,44 +1,18 @@ 1 1 {{velocity}} 2 2 #set($headline = "$!wikimacro.parameters.headline") 3 +#set($desc = "$!wikimacro.parameters.description") 3 3 #set($url = "$!wikimacro.parameters.url") 4 -#set($description = "$!wikimacro.parameters.description") 5 5 #set($image = "$!wikimacro.parameters.image") 6 6 7 -## Escape for copy box — so it's literal and doesn't render 8 -#set($copyText = """ 9 -(% style="margin-bottom:20px; width:100%" %) 10 -|#if($image != "")[[image:$image||data-xwiki-image-style="thumbnail-clickable" style="border:1px solid #ccc" width="200"]]#{else}No image provided.#{end}| 11 -=== [[$headline>>$url]] === 12 -$description 13 -[[Read More>>$url]] 14 -""") 15 - 16 -## Left side: Copyable syntax 17 -{{box title="Wiki Syntax (Copy and paste this)" cssClass="infobox" style="width:48%; float:left; margin-right:2%;"}} 18 -{{code language="xwiki/2.1"}} 19 -$copyText 20 -{{/code}} 21 -{{/box}} 22 - 23 -## Right side: Preview 24 -{{box title="Preview" cssClass="floatinginfobox" style="width:48%; float:left;"}} 25 -#if($image && $image != "") 26 - [[image:$image||width="200" style="border:1px solid #ccc;"]] 27 -#else 28 - (% style="width:200px; height:150px; background:#eee; text-align:center; border:1px solid #ccc;" %) 29 - No image 30 - (%) 7 +## Enforce https:// if user forgot it 8 +#if(!$url.startsWith("http")) 9 + #set($url = "https://$url") 31 31 #end 32 32 33 -=== [[$headline>>$url]] === 34 - 35 -$description 36 - 37 -[[Read More>>$url]] 38 -{{/box}} 39 - 40 -## Clear the floats 41 -(% style="clear:both;" %) 42 -(%) 12 +(% style="margin-bottom:20px; width:100%" %) 13 +|[[image:$image||data-xwiki-image-style="thumbnail-clickable" width="200" style="border:1px solid #ccc;"]]| 14 +=== $headline === 15 +**$desc**\\ 16 +[[Read More>>url:$url]] 43 43 {{/velocity}} 44 44