| ... |
... |
@@ -5,38 +5,39 @@ |
| 5 |
5 |
#set($mparams = $xcontext.macro.params) |
| 6 |
6 |
#end |
| 7 |
7 |
|
| 8 |
|
-#set($id = $util.convertToAlphaNumeric($mparams.id)) |
| 9 |
|
-#set($effect = $mparams.effect) |
|
8 |
+## Parameter vorbereiten |
|
9 |
+#if($mparams.id) |
|
10 |
+ #set($id = $util.convertToAlphaNumeric($mparams.id)) |
|
11 |
+#end |
|
12 |
+#set($divstyle = $escapetool.xml($mparams.style)) |
|
13 |
+#set($effect = $escapetool.xml($mparams.effect)) |
| 10 |
10 |
#if($effect == "appear" || $effect == "fade") |
| 11 |
11 |
#set($effect = "fadeToggle") |
| 12 |
|
-#elseif($effect == "blind" || $effect == "slide") |
|
16 |
+#elseif ($effect == "blind" || $effect == "slide") |
| 13 |
13 |
#set($effect = "slideToggle") |
| 14 |
14 |
#end |
| 15 |
15 |
#set($effectduration = $mathtool.mul(1000,$mparams.effectduration)) |
| 16 |
|
-#set($language = $mparams.language) |
| 17 |
|
-#if(!$language || $language == "") |
| 18 |
|
- #set($language = "bash") |
| 19 |
|
-#end |
|
20 |
+#set($title = $escapetool.xml($mparams.title)) |
| 20 |
20 |
|
| 21 |
|
-#set($codeStart = '{{code language="' + $language + '"}}') |
| 22 |
|
-#set($codeEnd = '{{/code}}') |
| 23 |
|
-#set($content = $codeStart + $wikimacrocontent + $codeEnd) |
| 24 |
24 |
{{html clean=false}} |
| 25 |
25 |
<div class="showhide-header" |
| 26 |
|
- id="showhideheader${id}" |
| 27 |
|
- data-show-effect="$effect" |
| 28 |
|
- data-show-duration="$effectduration"> |
|
24 |
+ #if($id && $id!="") id="showhideheader${id}" #end |
|
25 |
+ data-show-duration="$effectduration" |
|
26 |
+ data-show-effect="$effect"> |
| 29 |
29 |
<div class="showhide-header-flex"> |
| 30 |
|
- <div class="showhide-title">$mparams.title</div> |
| 31 |
|
- <div class="showhide-arrow">▶</div> |
|
28 |
+ <div class="showhide-title">$title</div> |
|
29 |
+ <div class="showhide-arrow">▶</div> ## Unicode ▶ |
| 32 |
32 |
</div> |
| 33 |
33 |
</div> |
| 34 |
|
- |
| 35 |
|
-<div class="showhidecontent" |
| 36 |
|
- id="showhidecontent${id}" |
| 37 |
|
- style="display: none;"> |
| 38 |
|
- $xwiki.renderText($content, $doc.syntaxId) |
| 39 |
|
-</div> |
| 40 |
40 |
{{/html}} |
| 41 |
|
-{{/velocity}} |
| 42 |
42 |
|
|
34 |
+#set($language = $mparams.language) |
|
35 |
+#if(!$language || $language == "") |
|
36 |
+ #set($language = "bash") |
|
37 |
+#end |
|
38 |
+ |
|
39 |
+#set($codeStart = "{{code language=\"" + $language + "\"}}") |
|
40 |
+#set($codeEnd = "{{/code}}") |
|
41 |
+#set($content = $codeStart + $wikimacrocontent + $codeEnd) |
|
42 |
+$xwiki.renderText($content, $doc.syntaxId) |
|
43 |
+{{/velocity}} |
