Changes for page APIMacro

Summary

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

Details

Page properties

Content

...	...	@@ -1,15 +1,7 @@
1		-{{aagon.floatingbox/}}
	1	+{{apimacro title="APIMacro"}}
	2	+Code
2	2
3		-{{apimacro title="Text"}}
4		-Text
5		-Text
6		-Text
7		-{{/apimacro}}
	4	+Code
8	8
9		-{{apimacro title="Code"}}
10	10	Code
11	11	{{/apimacro}}
12		-
13		-{{apimacro title="APIMacro"}}
14		-
15		-{{/apimacro}}

XWiki.StyleSheetExtension[0]

Code

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

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,16 +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		- #set($titleRendered = $xwiki.renderText($wikiSyntaxTitle, $doc.syntaxId))
26		-#else
27		- #set($titleRendered = "")
28		-#end
29		-
	20	+#set($title = $escapetool.xml($mparams.title))
	21	+(% #if($divstyle && $divstyle!="") style="${divstyle}" #end %)
	22	+(((
30	30	{{html clean=false}}
31	31	<div class="showhide-header"
32	32	#if($id && $id!="") id="showhideheader${id}" #end
...	...	@@ -33,12 +33,11 @@
33	33	data-show-duration="$effectduration"
34	34	data-show-effect="$effect">
35	35	<div class="showhide-header-flex">
36		- <div class="showhide-title">$!titleRendered</div>
	29	+ <div class="showhide-title">$title</div>
37	37	<div class="showhide-arrow">&#9654;</div> ## Unicode ▶
38	38	</div>
39	39	</div>
40	40	{{/html}}
41		-
42	42	(% class="showhidecontent" #if($id && $id!="")id="showhidecontent${id}" #end#if($xcontext.action != 'edit') style="display: none;"#end %)
43	43	(((
44	44	(((
...	...	@@ -45,5 +45,6 @@
45	45	{{wikimacrocontent /}}
46	46	)))
47	47	)))
48		-{{/velocity}}
49	49
	41	+)))
	42	+{{/velocity}}