| ... |
... |
@@ -4,11 +4,11 @@ |
| 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") |
| ... |
... |
@@ -18,7 +18,8 @@ |
| 18 |
18 |
#end |
| 19 |
19 |
#set($effectduration = $mathtool.mul(1000,$mparams.effectduration)) |
| 20 |
20 |
#set($title = $escapetool.xml($mparams.title)) |
| 21 |
|
- |
|
21 |
+(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %) |
|
22 |
+((( |
| 22 |
22 |
{{html clean=false}} |
| 23 |
23 |
<div class="showhide-header" |
| 24 |
24 |
#if($id && $id!="") id="showhideheader${id}" #end |
| ... |
... |
@@ -30,12 +30,20 @@ |
| 30 |
30 |
</div> |
| 31 |
31 |
</div> |
| 32 |
32 |
{{/html}} |
|
34 |
+#set($codeLang = "text") |
|
35 |
+#if($mparams.language && $mparams.language != "") |
|
36 |
+ #set($codeLang = $escapetool.xml($mparams.language)) |
|
37 |
+#end |
| 33 |
33 |
|
| 34 |
|
-(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %) |
|
39 |
+(% class="showhidecontent" |
|
40 |
+ #if($id && $id!="")id="showhidecontent${id}" #end |
|
41 |
+ #if($xcontext.action != 'edit') style="display: none;" #end |
|
42 |
+%) |
| 35 |
35 |
((( |
| 36 |
|
-((( |
| 37 |
|
-{{wikimacrocontent /}} |
| 38 |
|
-))) |
|
44 |
+{{html clean="false"}} |
|
45 |
+{{code language="$codeLang"}}#evaluate($wikimacrocontent){{/code}} |
|
46 |
+{{/html}} |
| 39 |
39 |
))) |
| 40 |
|
-{{/velocity}} |
| 41 |
41 |
|
|
49 |
+))) |
|
50 |
+{{/velocity}} |
