Änderungen von Dokument Expand

Zusammenfassung

• Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)
• Objekte (3 geändert, 1 hinzugefügt, 0 gelöscht)
  • XWiki.StyleSheetExtension[0]
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[0]
  • XWiki.WikiMacroParameterClass[1]

Details

Seiteneigenschaften

Inhalt

...	...	@@ -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}}
12		-Hello 👀
	13	+{{expand expanded="false"}}
	14	+Hello
13	13	{{/expand}}

XWiki.StyleSheetExtension[0]

Code

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

XWiki.WikiMacroClass[0]

Makro-Code

...	...	@@ -1,23 +1,83 @@
1	1	{{velocity output="false"}}
2		-#macro (executeMacro)
3		- $xwiki.ssx.use('Confluence.Macros.Expand')
4		- #set ($opened = $xcontext.action == 'edit' || $request.getParameter('format') == "html-print")
	2	+#macro (exportMode $escapedTitle)
	3	+ ## Use a different structure when exporting to make sure that the pagedjs can properly parse the content.
	4	+
5	5	{{html clean="false" wiki="true"}}
6		- <details class="confluence-expand-macro panel panel-default" #if ($opened)open#end>
7		- <summary>
8		- <div class="panel-title">
9		- <span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
10		- $services.rendering.escape($escapetool.xml("${wikimacro.parameters.title}"), 'xwiki/2.1')
11		- </div>
12		- </summary>
	6	+ <div class = "panel panel-default confluence-expand-macro">
	7	+ <div class>
	8	+ <span class="panel-title">
	9	+ <span class="glyphicon glyphicon-menu-down" aria-hidden="true"></span>
	10	+ <span class="title-text">
	11	+ $escapedTitle
	12	+ </span>
	13	+ </span>
	14	+ </div>
13	13	<div class="panel-body">
14	14
15	15	{{wikimacrocontent /}}
16	16
17	17	</div>
18		- </details>
	20	+ </div>
19	19	{{/html}}
	22	+
20	20	#end
	24	+
	25	+#macro (executeMacro)
	26	+
	27	+ #set ($discard = $xwiki.ssx.use('Confluence.Macros.Expand'))
	28	+ #set ($title = $wikimacro.parameters.title)
	29	+ #if ("$!title" == "")
	30	+ #set ($title = $services.promacroexpand.getAutoTitle($wikimacro.content, $xwiki.currentContentSyntaxId))
	31	+ #end
	32	+ #if ("$!title" == "")
	33	+ #set ($title = $services.localization.render("rendering.macro.expand.defaultexpandtitle"))
	34	+ #end
	35	+ #set ($escapedTitle = $services.rendering.escape($escapetool.xml($title), $xwiki.currentContentSyntaxId))
	36	+ #if ($xcontext.action == 'export')
	37	+ #exportMode($escapedTitle)
	38	+ #else
	39	+ ## To avoid an issue regarding {{wikimacroparameter}} and {{wikimacrocontent}} that fail to render when in
	40	+ ## edit mode while inside a HTML macro, we need to manually write the HTML by using XWiki syntax. This way,
	41	+ ## while the macro will always be expanded when in edit mode, the user will be able to modify the text inline.
	42	+ #set ($targetSyntaxId = $wikimacro.context.transformationContext.targetSyntax.type.id)
	43	+ #if ($targetSyntaxId == 'annotatedhtml' || $targetSyntaxId == 'annotatedxhtml' || $request.outputSyntax == 'annotatedhtml')
	44	+ (% class="confluence-expand-macro panel panel-default" %)
	45	+ (((
	46	+ (((
	47	+ (% class="panel-title" %)
	48	+ (((
	49	+ (% class="glyphicon glyphicon-menu-down" aria-hidden="true" %)
	50	+ ((()))
	51	+ {{wikimacroparameter name='title' /}}
	52	+ )))
	53	+ )))
	54	+ (% class="panel-body" %)
	55	+ (((
	56	+ {{wikimacrocontent /}}
	57	+ )))
	58	+ )))
	59	+ #else
	60	+ #set ($opened = $xcontext.action == 'edit'|| $wikimacro.parameters.expanded)
	61	+ {{html clean="false" wiki="true"}}
	62	+ <details class="confluence-expand-macro panel panel-default" #if ($opened)open#end>
	63	+ <summary>
	64	+ <span class="panel-title">
	65	+ <span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
	66	+ <span class="title-text">
	67	+ $escapedTitle
	68	+ </span>
	69	+ </span>
	70	+ </summary>
	71	+ <div class="panel-body">
	72	+
	73	+ {{wikimacrocontent /}}
	74	+
	75	+ </div>
	76	+ </details>
	77	+ {{/html}}
	78	+ #end
	79	+ #end
	80	+#end
21	21	{{/velocity}}
22	22
23	23	{{velocity}}

Makrobeschreibung

...	...	@@ -1,5 +1,0 @@
1		-Add the Expand macro to your page to provide content in an expandable / collapsible section.
2		-
3		-This is one of Confluence's most popular macros. It's great for: visually reducing the amount of information on a page, breaking process information down into clickable steps, hiding background or obsolete information, while still keeping it on the page for future reference.
4		-
5		-The macro is collapsed by default, people need to click each one to expand it. There's no way to expand all macros on a page at once, however all Expand macros are automatically expanded when you print or export the page to PDF.

Verfügbarkeit von Makroinhalten

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

XWiki.WikiMacroParameterClass[0]

Parameter-Beschreibung

...	...	@@ -1,1 +1,0 @@
1		-Defines the text that appears next to the expand/collapse icon.

XWiki.WikiMacroParameterClass[1]

Parameter-Vorgabe

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

Parameter-Name

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

Parameter-Typ

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

Parameter verpflichtend

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