Zum Inhalt springen

Änderungen von Dokument Expand

Zuletzt geändert von xwikiadmin am 2025/05/21 10:03
Von Version 6.1
bearbeitet von xwikiadmin
am 2025/05/21 10:03
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.26.19]
Auf Version 2.1
bearbeitet von xwikiadmin
am 2023/10/26 09:30
Änderungskommentar: Migrated property [type] from class [XWiki.WikiMacroParameterClass]

Zusammenfassung

Details

Seiteneigenschaften
Übergeordnete Seite
... ... @@ -1,1 +1,1 @@
1 -WebHome
1 +Confluence.Macros
Inhalt
... ... @@ -3,13 +3,11 @@
3 3  = Parameters =
4 4  
5 5  |=Parameter|=Description|=Required|=Default
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
6 +|**title**|Text displayed on the collaspse toggle|No|Click here to expand...
8 8  
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.
10 10  
11 11  = Example Usage =
12 12  
13 -{{expand expanded="false"}}
14 -Hello
11 +{{expand}}
12 +Hello 👀
15 15  {{/expand}}
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,45 +1,38 @@
1 -.confluence-expand-macro .glyphicon {
2 - margin-right: 0.5rem;
3 - transform: rotate(0deg);
4 - transition: transform 0.3s;
5 -}
1 +.confluence-expand-macro {
6 6  
7 -.confluence-expand-macro[open] > summary .glyphicon {
8 - transform: rotate(90deg);
9 -}
3 + .panel-heading {
4 + padding: 0;
5 + .panel-title {
6 + font-size: 1em;
10 10  
11 -.confluence-expand-macro .panel-title{
12 - padding: @panel-heading-padding;
13 - display: flex;
14 -}
8 + a {
9 + display: block;
10 + padding: @panel-heading-padding;
15 15  
16 -.confluence-expand-macro .panel-body {
17 - transition: linear 0.3s;
18 -}
12 + p {
13 + display: inline;
14 + }
19 19  
20 -.confluence-expand-macro summary {
21 - font-size: 1em;
22 -}
16 + .glyphicon {
17 + margin-right: 0.5rem;
18 + transform: rotate(0deg);
19 + transition: transform 0.1s;
20 + }
21 + &[aria-expanded="true"] .glyphicon {
22 + transform: rotate(90deg);
23 + }
24 + }
25 + }
26 + }
23 23  
24 -.confluence-expand-macro summary:hover {
25 - cursor: pointer;
26 -}
28 + .panel-collapse {
29 + .panel-body {
30 + display: block;
31 + &::before { content: none; }
32 + &::after { content: none; }
27 27  
28 -.panel-title:hover .title-text {
29 - cursor: pointer;
30 - text-decoration: underline;
34 + & > *:first-child { margin-top: 0; }
35 + & > *:last-child { margin-bottom: 0; }
36 + }
37 + }
31 31  }
32 -
33 -.confluence-expand-macro.panel > .panel-body, .confluence-expand-macro > summary {
34 - background: unset;
35 - border: none;
36 -}
37 -
38 -.confluence-expand-macro.panel.panel-default .panel-body ul {
39 - list-style-type: revert;
40 - padding-left: revert;
41 -}
42 -
43 -.confluence-expand-macro.panel {
44 - background: unset;
45 -}
XWiki.WikiMacroClass[0]
Makro-Code
... ... @@ -1,64 +1,53 @@
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)
7 - #set ($discard = $xwiki.ssx.use('Confluence.Macros.Expand'))
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 - )))
3 + $xwiki.ssx.use('Confluence.Macros.Expand')
4 + #if (!$expandMacroColllapseId)
5 + #set ($expandMacroColllapseId = 0)
25 25   #else
26 - #set ($opened = $xcontext.action == 'edit' || $xcontext.action == 'export' || $wikimacro.parameters.expanded)
27 - {{html clean="false" wiki="true"}}
28 - <details class="confluence-expand-macro panel panel-default" #if ($opened)open#end>
29 - <summary>
30 - <span class="panel-title">
31 - <span class="glyphicon glyphicon-menu-right" aria-hidden="true"></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>
43 - </summary>
44 - <div class="panel-body">
7 + #set ($expandMacroColllapseId = $expandMacroColllapseId + 1)
8 + #end
9 + #set ($opened = $xcontext.action == 'edit')
10 + #set ($accordionId = "accordion-$escapetool.xml($expandMacroColllapseId)")
11 + #set ($toggleId = "toggle-$expandMacroColllapseId")
12 + #set ($expandId = "collapse-$expandMacroColllapseId")
45 45  
46 - {{wikimacrocontent /}}
47 -
14 + {{html clean="false" wiki="true"}}
15 + <div class="panel-group confluence-expand-macro" id="${accordionId}" role="tablist">
16 + <div class="panel panel-default">
17 + <div class="panel-heading" role="tab" id="${toggleId}">
18 + <h4 class="panel-title">
19 + <a
20 + role="button"
21 + data-toggle="collapse"
22 + data-parent="#${accordionId}"
23 + href="#${expandId}"
24 + #if($opened)aria-expanded="true"#end
25 + aria-controls="${expandId}"
26 + ><span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>{{wikimacroparameter name="title" /}}</a>
27 + </h4>
28 + </div>
29 + <div id="${expandId}" class="panel-collapse collapse #if($opened)in#end" role="tabpanel" aria-labelledby="${toggleId}">
30 + <div class="panel-body">
31 + {{wikimacrocontent /}}
32 + </div>
33 + </div>
48 48   </div>
49 - </details>
35 + </div>
50 50   {{/html}}
51 - #end
52 52  #end
53 53  {{/velocity}}
54 54  
40 +{{include reference="Licenses.Code.VelocityMacros"/}}
41 +
55 55  {{velocity}}
56 56  ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
57 57  ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
58 58  ## don't have view right on those pages.
59 -#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
46 +#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
60 60   #executeMacro
61 61  #else
62 - {{missingLicenseMessage extensionName="proMacros.extension.name"/}}
49 + {{error}}
50 + #getMissingLicenseMessage('proMacros.extension.name')
51 + {{/error}}
63 63  #end
64 64  {{/velocity}}
Verfügbarkeit von Makroinhalten
... ... @@ -1,1 +1,1 @@
1 -Mandatory
1 +Optional
Makrobeschreibung
... ... @@ -1,0 +1,5 @@
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.
XWiki.WikiMacroParameterClass[0]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +Defines the text that appears next to the expand/collapse icon.
XWiki.WikiMacroParameterClass[1]
Parameter-Vorgabe
... ... @@ -1,1 +1,0 @@
1 -0
Parameter-Name
... ... @@ -1,1 +1,0 @@
1 -expanded
Parameter-Typ
... ... @@ -1,1 +1,0 @@
1 -java.lang.Boolean
Parameter verpflichtend
... ... @@ -1,1 +1,0 @@
1 -Nein