| ... |
... |
@@ -5,7 +5,6 @@ |
| 5 |
5 |
#set($mparams = $xcontext.macro.params) |
| 6 |
6 |
#end |
| 7 |
7 |
|
| 8 |
|
-## Parameter vorbereiten |
| 9 |
9 |
#if($mparams.id) |
| 10 |
10 |
#set($id = $util.convertToAlphaNumeric($mparams.id)) |
| 11 |
11 |
#end |
| ... |
... |
@@ -17,8 +17,12 @@ |
| 17 |
17 |
#set($effect = "slideToggle") |
| 18 |
18 |
#end |
| 19 |
19 |
#set($effectduration = $mathtool.mul(1000,$mparams.effectduration)) |
| 20 |
|
-#set($title = $escapetool.xml($mparams.title)) |
| 21 |
21 |
|
|
20 |
+#set($title = $mparams.title) |
|
21 |
+ |
|
22 |
+## XWiki-Syntax direkt ausgeben |
|
23 |
+= $title = |
|
24 |
+ |
| 22 |
22 |
{{html clean=false}} |
| 23 |
23 |
<div class="showhide-header" |
| 24 |
24 |
#if($id && $id!="") id="showhideheader${id}" #end |
| ... |
... |
@@ -25,26 +25,19 @@ |
| 25 |
25 |
data-show-duration="$effectduration" |
| 26 |
26 |
data-show-effect="$effect"> |
| 27 |
27 |
<div class="showhide-header-flex"> |
| 28 |
|
- <div class="showhide-title">$title</div> |
| 29 |
|
- <div class="showhide-arrow">▶</div> ## Unicode ▶ |
|
31 |
+ <div class="showhide-arrow">▶</div> |
| 30 |
30 |
</div> |
| 31 |
31 |
</div> |
| 32 |
32 |
{{/html}} |
| 33 |
33 |
|
| 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 |
|
- |
| 43 |
|
-{{html clean=false}} |
| 44 |
|
-<div class="showhidecontent" |
| 45 |
|
- #if($id && $id!="") id="showhidecontent${id}" #end |
| 46 |
|
- #if($xcontext.action != 'edit') style="display: none;" #end> |
| 47 |
|
- $xwiki.renderText($content, $doc.syntaxId) |
| 48 |
|
-</div> |
| 49 |
|
-{{/html}} |
|
36 |
+(% class="showhidecontent" |
|
37 |
+ #if($id && $id!="") id="showhidecontent${id}" #end |
|
38 |
+ #if($xcontext.action != 'edit') style="display: none;" #end |
|
39 |
+%) |
|
40 |
+((( |
|
41 |
+((( |
|
42 |
+{{wikimacrocontent /}} |
|
43 |
+))) |
|
44 |
+))) |
| 50 |
50 |
{{/velocity}} |
|
46 |
+ |