Changes for page APIMacro

Summary

• Objects (2 modified, 0 added, 0 removed)
  • XWiki.StyleSheetExtension[0]
  • XWiki.WikiMacroClass[0]

Details

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,13 +6,9 @@
1		-.showhide-wrapper {
2		- margin: 6px 0 20px;
3		- overflow: hidden;
4		-}
5		-
6	6	.showhide-header {
7	7	border: 1px solid #ccc;
8	8	background-color: #f7f7f7;
9	9	border-radius: 4px 4px 0 0;
10	10	padding: 10px 12px;
	6	+ margin: 30px 30px 0 0;
11	11	cursor: pointer;
12	12	user-select: none;
13	13	}

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -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")
...	...	@@ -17,26 +17,20 @@
17	17	#set($effect = "slideToggle")
18	18	#end
19	19	#set($effectduration = $mathtool.mul(1000,$mparams.effectduration))
20		-#set($rawTitle = $mparams.title)
21		-#if($rawTitle && $rawTitle != "")
22		- #set($title = "= $rawTitle =")
23		-#else
24		- #set($title = "")
25		-#end
26		-
27		-## Titel im Wiki-Syntax rendern
28		-{{wiki}}$title{{/wiki}}
29		-
	20	+#set($title = $escapetool.xml($mparams.title))
	21	+(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %)
	22	+(((
30	30	{{html clean=false}}
31		-<div class="showhide-wrapper" ...>
32		- <div class="showhide-header" ...>
33		- <div class="showhide-header-flex">
34		- <div class="showhide-arrow">&#9654;</div>
35		- </div>
	24	+<div class="showhide-header"
	25	+ #if($id && $id!="") id="showhideheader${id}" #end
	26	+ data-show-duration="$effectduration"
	27	+ data-show-effect="$effect">
	28	+ <div class="showhide-header-flex">
	29	+ <div class="showhide-title">$title</div>
	30	+ <div class="showhide-arrow">&#9654;</div> ## Unicode ▶
36	36	</div>
37		- </div>
	32	+</div>
38	38	{{/html}}
39		-
40	40	(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
41	41	(((
42	42	(((
...	...	@@ -43,5 +43,6 @@
43	43	{{wikimacrocontent /}}
44	44	)))
45	45	)))
46		-{{/velocity}}
47	47
	41	+)))
	42	+{{/velocity}}