| ... |
... |
@@ -17,13 +17,7 @@ |
| 17 |
17 |
#set($effect = "slideToggle") |
| 18 |
18 |
#end |
| 19 |
19 |
#set($effectduration = $mathtool.mul(1000,$mparams.effectduration)) |
| 20 |
|
-#set($rawTitle = $mparams.title) |
| 21 |
|
-#if($rawTitle && $rawTitle != "") |
| 22 |
|
- #set($wikiSyntaxTitle = "= $rawTitle =") |
| 23 |
|
- #set($titleRendered = $xwiki.renderText($wikiSyntaxTitle, $doc.syntaxId)) |
| 24 |
|
-#else |
| 25 |
|
- #set($titleRendered = "") |
| 26 |
|
-#end |
|
20 |
+#set($title = $escapetool.xml($mparams.title)) |
| 27 |
27 |
|
| 28 |
28 |
{{html clean=false}} |
| 29 |
29 |
<div class="showhide-header" |
| ... |
... |
@@ -31,17 +31,20 @@ |
| 31 |
31 |
data-show-duration="$effectduration" |
| 32 |
32 |
data-show-effect="$effect"> |
| 33 |
33 |
<div class="showhide-header-flex"> |
| 34 |
|
- <div class="showhide-title">$!titleRendered</div> |
|
28 |
+ <div class="showhide-title">$title</div> |
| 35 |
35 |
<div class="showhide-arrow">▶</div> ## Unicode ▶ |
| 36 |
36 |
</div> |
| 37 |
37 |
</div> |
| 38 |
38 |
{{/html}} |
| 39 |
39 |
|
| 40 |
|
-(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %) |
| 41 |
|
-((( |
| 42 |
|
-((( |
| 43 |
|
-{{wikimacrocontent /}} |
| 44 |
|
-))) |
| 45 |
|
-))) |
| 46 |
|
-{{/velocity}} |
|
34 |
+#set($language = $mparams.language) |
|
35 |
+#if(!$language || $language == "") |
|
36 |
+ #set($language = "bash") |
|
37 |
+#end |
| 47 |
47 |
|
|
39 |
+#set($codeStart = '{{code language="' + $language + '"}}') |
|
40 |
+#set($codeEnd = '{{/code}}') |
|
41 |
+#set($content = $codeStart + $wikimacrocontent + $codeEnd) |
|
42 |
+ |
|
43 |
+$xwiki.renderText($content, $doc.syntaxId) |
|
44 |
+{{/velocity}} |
