| ... |
... |
@@ -1,14 +1,14 @@ |
| 1 |
1 |
{{velocity}} |
| 2 |
|
-#set($discard = $xwiki.jsx.use("Macros.APIMacro")) |
|
2 |
+#set($discard = $xwiki.jsx.use("Macros.ShowHideMacro")) |
| 3 |
3 |
#set($mparams = $wikimacro.parameters) |
| 4 |
4 |
#if(!$mparams) |
| 5 |
5 |
#set($mparams = $xcontext.macro.params) |
| 6 |
6 |
#end |
| 7 |
|
- |
| 8 |
|
-## Parameter vorbereiten |
| 9 |
9 |
#if($mparams.id) |
| 10 |
10 |
#set($id = $util.convertToAlphaNumeric($mparams.id)) |
| 11 |
11 |
#end |
|
10 |
+#set($showmessage = $escapetool.xml($mparams.showmessage)) |
|
11 |
+#set($hidemessage = $escapetool.xml($mparams.hidemessage)) |
| 12 |
12 |
#set($divstyle = $escapetool.xml($mparams.style)) |
| 13 |
13 |
#set($effect = $escapetool.xml($mparams.effect)) |
| 14 |
14 |
#if($effect == "appear" || $effect == "fade") |
| ... |
... |
@@ -17,13 +17,9 @@ |
| 17 |
17 |
#set($effect = "slideToggle") |
| 18 |
18 |
#end |
| 19 |
19 |
#set($effectduration = $mathtool.mul(1000,$mparams.effectduration)) |
| 20 |
|
- |
| 21 |
|
-## Titel vorbereiten als Wiki-Syntax und gerendert |
| 22 |
|
-#set($rawTitle = $mparams.title) |
| 23 |
|
-#if($rawTitle && $rawTitle != "") |
| 24 |
|
- #set($wikiSyntaxTitle = = $rawTitle =) |
| 25 |
|
-#end |
| 26 |
|
- |
|
20 |
+#set($title = $escapetool.xml($mparams.title)) |
|
21 |
+(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %) |
|
22 |
+((( |
| 27 |
27 |
{{html clean=false}} |
| 28 |
28 |
<div class="showhide-header" |
| 29 |
29 |
#if($id && $id!="") id="showhideheader${id}" #end |
| ... |
... |
@@ -30,19 +30,16 @@ |
| 30 |
30 |
data-show-duration="$effectduration" |
| 31 |
31 |
data-show-effect="$effect"> |
| 32 |
32 |
<div class="showhide-header-flex"> |
| 33 |
|
- <div class="showhide-title"> |
| 34 |
|
- #evaluate($wikiSyntaxTitle) |
| 35 |
|
- </div> |
|
29 |
+ <div class="showhide-title">$title</div> |
| 36 |
36 |
<div class="showhide-arrow">▶</div> ## Unicode ▶ |
| 37 |
37 |
</div> |
| 38 |
38 |
</div> |
| 39 |
39 |
{{/html}} |
| 40 |
|
- |
| 41 |
41 |
(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %) |
| 42 |
|
-((( |
| 43 |
|
-((( |
|
35 |
+((( |
|
36 |
+((( |
| 44 |
44 |
{{wikimacrocontent /}} |
| 45 |
|
-))) |
| 46 |
46 |
))) |
|
39 |
+))) |
|
40 |
+))) |
| 47 |
47 |
{{/velocity}} |
| 48 |
|
- |
