Änderungen von Dokument Button

Zuletzt geändert von xwikiadmin am 2024/06/24 15:04

Von Version 2.1
bearbeitet von xwikiadmin
am 2023/04/25 11:27
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros/1.7.1]
Auf Version 5.1
bearbeitet von xwikiadmin
am 2024/06/24 15:04
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.19.4]

Zusammenfassung

Details

Seiteneigenschaften
Übergeordnete Seite
... ... @@ -1,1 +1,1 @@
1 -xwiki:XWiki.Macros.WebHome
1 +WebHome
Versteckt
... ... @@ -1,1 +1,1 @@
1 -false
1 +true
XWiki.WikiMacroClass[0]
Makro-Code
... ... @@ -46,6 +46,12 @@
46 46   #set ($darkenedColors = [])
47 47   #darken($colors, $darkenedColors)
48 48   {{html clean=false}}
49 + ## #124: The Button macro deletes followup content when inserted from wysiwyg
50 + ## Wrap the macro output inside a block element if the context where the macro is inserted is not inline, e.g. if the
51 + ## macro is inserted between paragraphs rather than between the text of a paragraph. Otherwise the generated HTML is
52 + ## invalid which breaks the WYSIWYG editing because the browser tries to fix the invalid HTML and messes up the macro
53 + ## output markers that protect the macro output.
54 + #if (!$wikimacro.context.isInline())<p>#end
49 49   <a href="$url" #if($newTab == 'true')target="_blank"#end>
50 50   <button
51 51   style="
... ... @@ -59,21 +59,18 @@
59 59   $label
60 60   </button>
61 61   </a>
68 + #if (!$wikimacro.context.isInline())</p>#end
62 62   {{/html}}
63 63  #end
64 64  {{/velocity}}
65 65  
66 -{{include reference="Licenses.Code.VelocityMacros"/}}
67 -
68 68  {{velocity}}
69 69  ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
70 70  ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
71 71  ## don't have view right on those pages.
72 -#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
77 +#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
73 73   #executeMacro
74 74  #else
75 - {{error}}
76 - #getMissingLicenseMessage('proMacros.extension.name')
77 - {{/error}}
80 + {{missingLicenseMessage extensionName="proMacros.extension.name"/}}
78 78  #end
79 79  {{/velocity}}