| ... |
... |
@@ -31,13 +31,20 @@ |
| 31 |
31 |
</div> |
| 32 |
32 |
{{/html}} |
| 33 |
33 |
|
| 34 |
|
-(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %) |
| 35 |
|
-((( |
| 36 |
|
-{{wiki}} |
| 37 |
|
-{{code}} |
| 38 |
|
-{{wikimacrocontent /}} |
| 39 |
|
-{{/code}} |
| 40 |
|
-{{/wiki}} |
| 41 |
|
-))) |
| 42 |
|
-{{/velocity}} |
|
34 |
+#set($language = $mparams.language) |
|
35 |
+#if(!$language || $language == "") |
|
36 |
+ #set($language = "bash") |
|
37 |
+#end |
| 43 |
43 |
|
|
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}} |
|
50 |
+{{/velocity}} |
