Modifications pour le document Expand

Résumé

• Propriétés de la Page (1 modifications, 0 ajouts, 0 suppressions)
• Objets (2 modifications, 1 ajouts, 0 suppressions)
  • XWiki.StyleSheetExtension[0]
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[1]

Détails

Propriétés de la Page

Contenu

...	...	@@ -3,11 +3,13 @@
3	3	= Parameters =
4	4
5	5	|=Parameter|=Description|=Required|=Default
6		-|**title**|Text displayed on the collaspse toggle|No|Click here to expand...
	6	+|**title**|Text displayed on the collaspse toggle|No|(empty)
	7	+|**expanded**|If selected the expand will be opened automatically when loading the page.|No|False
7	7
	9	+Note: if no title is provided, the title of the first panel or the first header appearing in the content will be used. if there is no such header or panel title, "Click here to expand…" will be used.
8	8
9	9	= Example Usage =
10	10
11		-{{expand}}
	13	+{{expand expanded="false"}}
12	12	Hello 👀
13	13	{{/expand}}

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -10,7 +10,7 @@
10	10
11	11	.confluence-expand-macro .panel-title{
12	12	padding: @panel-heading-padding;
13		- display: block;
	13	+ display: flex;
14	14	}
15	15
16	16	.confluence-expand-macro .panel-body {
...	...	@@ -23,6 +23,10 @@
23	23
24	24	.confluence-expand-macro summary:hover {
25	25	cursor: pointer;
	26	+}
	27	+
	28	+.panel-title:hover .title-text {
	29	+ cursor: pointer;
26	26	text-decoration: underline;
27	27	}
28	28
...	...	@@ -31,6 +31,11 @@
31	31	border: none;
32	32	}
33	33
	38	+.confluence-expand-macro.panel.panel-default .panel-body ul {
	39	+ list-style-type: revert;
	40	+ padding-left: revert;
	41	+}
	42	+
34	34	.confluence-expand-macro.panel {
35	35	background: unset;
36	36	}

XWiki.WikiMacroClass[0]

Code de la macro

...	...	@@ -1,14 +1,45 @@
1	1	{{velocity output="false"}}
2	2	#macro (executeMacro)
	3	+ ## To avoid an issue regarding {{wikimacroparameter}} and {{wikimacrocontent}} that fail to render when in
	4	+ ## edit mode while inside a HTML macro, we need to manually write the HTML by using XWiki syntax. This way,
	5	+ ## while the macro will always be expanded when in edit mode, the user will be able to modify the text inline.
	6	+ #set ($targetSyntaxId = $wikimacro.context.transformationContext.targetSyntax.type.id)
3	3	#set ($discard = $xwiki.ssx.use('Confluence.Macros.Expand'))
4		- #set ($opened = $xcontext.action == 'edit' || $xcontext.action == 'export')
	8	+ #if ($targetSyntaxId == 'annotatedhtml' || $targetSyntaxId == 'annotatedxhtml' ||
	9	+ $request.outputSyntax == 'annotatedhtml')
	10	+ (% class="confluence-expand-macro panel panel-default" %)
	11	+ (((
	12	+ (((
	13	+ (% class="panel-title" %)
	14	+ (((
	15	+ (% class="glyphicon glyphicon-menu-down" aria-hidden="true" %)
	16	+ ((()))
	17	+ {{wikimacroparameter name='title' /}}
	18	+ )))
	19	+ )))
	20	+ (% class="panel-body" %)
	21	+ (((
	22	+ {{wikimacrocontent /}}
	23	+ )))
	24	+ )))
	25	+ #else
	26	+ #set ($opened = $xcontext.action == 'edit' || $xcontext.action == 'export' || $wikimacro.parameters.expanded)
5	5	{{html clean="false" wiki="true"}}
6	6	<details class="confluence-expand-macro panel panel-default" #if ($opened)open#end>
7	7	<summary>
8	8	<span class="panel-title">
9	9	<span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
10		- $services.rendering.escape($escapetool.xml("${wikimacro.parameters.title}"), 'xwiki/2.1')
11		- </span>
	32	+ #set ($title = $wikimacro.parameters.title)
	33	+ #if ("$!title" == "")
	34	+ #set ($title = $services.promacroexpand.getAutoTitle($wikimacro.content, $xwiki.currentContentSyntaxId))
	35	+ #if ("$!title" == "")
	36	+ #set ($title = $services.localization.render("rendering.macro.expand.defaultexpandtitle"))
	37	+ #end
	38	+ #end
	39	+ <span class="title-text">
	40	+ $services.rendering.escape($escapetool.xml($title), $xwiki.currentContentSyntaxId)
	41	+ </span>
	42	+ </span>
12	12	</summary>
13	13	<div class="panel-body">
14	14
...	...	@@ -17,6 +17,7 @@
17	17	</div>
18	18	</details>
19	19	{{/html}}
	51	+ #end
20	20	#end
21	21	{{/velocity}}
22	22

Disponibilité du contenu de la macro

...	...	@@ -1,1 +1,1 @@
1		-Optional
	1	+Mandatory

XWiki.WikiMacroParameterClass[1]

Valeur par défaut du paramètre

...	...	@@ -1,0 +1,1 @@
	1	+0

Paramètre obligatoire

...	...	@@ -1,0 +1,1 @@
	1	+Non

Nom du paramètre

...	...	@@ -1,0 +1,1 @@
	1	+expanded

Type du paramètre

...	...	@@ -1,0 +1,1 @@
	1	+java.lang.Boolean