Modifications pour le document Expand

Résumé

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

Détails

Propriétés de la Page

Parent

...	...	@@ -1,1 +1,1 @@
1		-WebHome
	1	+Confluence.Macros

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -8,9 +8,8 @@
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: block;
14	14	}
15	15
16	16	.confluence-expand-macro .panel-body {

XWiki.WikiMacroClass[0]

Code de la macro

...	...	@@ -1,14 +1,15 @@
1	1	{{velocity output="false"}}
2	2	#macro (executeMacro)
3		- #set ($discard = $xwiki.ssx.use('Confluence.Macros.Expand'))
4		- #set ($opened = $xcontext.action == 'edit' || $xcontext.action == 'export')
	3	+ $xwiki.ssx.use('Confluence.Macros.Expand')
	4	+ #set ($opened = $xcontext.action == 'edit')
	5	+
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		- <span class="panel-title">
	9	+ <div class="panel-title">
9	9	<span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
10	10	$services.rendering.escape($escapetool.xml("${wikimacro.parameters.title}"), 'xwiki/2.1')
11		- </span>
	12	+ </div>
12	12	</summary>
13	13	<div class="panel-body">
14	14
...	...	@@ -24,7 +24,7 @@
24	24	## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
25	25	## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
26	26	## don't have view right on those pages.
27		-#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
	28	+#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
28	28	#executeMacro
29	29	#else
30	30	{{missingLicenseMessage extensionName="proMacros.extension.name"/}}